Skip to content

A
Athena
Commit 4e7c1839 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

解决冲突

parents 3ee8bec5 ab0369f4
Hide whitespace changes
Inline Side-by-side
Showing with 1103 additions and 461 deletions
public/index.html
View file @ 4e7c1839
...@@ -756,61 +756,6 @@ ...@@ -756,61 +756,6 @@
} }
this.eventDiv_.style.display = this.labelDiv_.style.display; this.eventDiv_.style.display = this.labelDiv_.style.display;
}; };
/**
* @name MarkerWithLabelOptions
* @class This class represents the optional parameter passed to the {@link MarkerWithLabel} constructor.
* The properties available are the same as for <code>google.maps.Marker</code> with the addition
* of the properties listed below. To change any of these additional properties after the labeled
* marker has been created, call <code>google.maps.Marker.set(propertyName, propertyValue)</code>.
* <p>
* When any of these properties changes, a property changed event is fired. The names of these
* events are derived from the name of the property and are of the form <code>propertyname_changed</code>.
* For example, if the content of the label changes, a <code>labelcontent_changed</code> event
* is fired.
* <p>
* @property {string|Node} [labelContent] The content of the label (plain text or an HTML DOM node).
* @property {Point} [labelAnchor] By default, a label is drawn with its anchor point at (0,0) so
* that its top left corner is positioned at the anchor point of the associated marker. Use this
* property to change the anchor point of the label. For example, to center a 50px-wide label
* beneath a marker, specify a <code>labelAnchor</code> of <code>google.maps.Point(25, 0)</code>.
* (Note: x-values increase to the right and y-values increase to the top.)
* @property {string} [labelClass] The name of the CSS class defining the styles for the label.
* Note that style values for <code>position</code>, <code>overflow</code>, <code>top</code>,
* <code>left</code>, <code>zIndex</code>, <code>display</code>, <code>marginLeft</code>, and
* <code>marginTop</code> are ignored; these styles are for internal use only.
* @property {Object} [labelStyle] An object literal whose properties define specific CSS
* style values to be applied to the label. Style values defined here override those that may
* be defined in the <code>labelClass</code> style sheet. If this property is changed after the
* label has been created, all previously set styles (except those defined in the style sheet)
* are removed from the label before the new style values are applied.
* Note that style values for <code>position</code>, <code>overflow</code>, <code>top</code>,
* <code>left</code>, <code>zIndex</code>, <code>display</code>, <code>marginLeft</code>, and
* <code>marginTop</code> are ignored; these styles are for internal use only.
* @property {boolean} [labelInBackground] A flag indicating whether a label that overlaps its
* associated marker should appear in the background (i.e., in a plane below the marker).
* The default is <code>false</code>, which causes the label to appear in the foreground.
* @property {boolean} [labelVisible] A flag indicating whether the label is to be visible.
* The default is <code>true</code>. Note that even if <code>labelVisible</code> is
* <code>true</code>, the label will <i>not</i> be visible unless the associated marker is also
* visible (i.e., unless the marker's <code>visible</code> property is <code>true</code>).
* @property {boolean} [raiseOnDrag] A flag indicating whether the label and marker are to be
* raised when the marker is dragged. The default is <code>true</code>. If a draggable marker is
* being created and a version of Google Maps API earlier than V3.3 is being used, this property
* must be set to <code>false</code>.
* @property {boolean} [optimized] A flag indicating whether rendering is to be optimized for the
* marker. <b>Important: The optimized rendering technique is not supported by MarkerWithLabel,
* so the value of this parameter is always forced to <code>false</code>.
* @property {string} [crossImage="http://maps.gstatic.com/intl/en_us/mapfiles/drag_cross_67_16.png"]
* The URL of the cross image to be displayed while dragging a marker.
* @property {string} [handCursor="http://maps.gstatic.com/intl/en_us/mapfiles/closedhand_8_8.cur"]
* The URL of the cursor to be displayed while dragging a marker.
*/
/**
* Creates a MarkerWithLabel with the options specified in {@link MarkerWithLabelOptions}.
* @constructor
* @param {MarkerWithLabelOptions} [opt_options] The optional parameters.
*/
function MarkerWithLabel(opt_options) { function MarkerWithLabel(opt_options) {
opt_options = opt_options || {}; opt_options = opt_options || {};
opt_options.labelContent = opt_options.labelContent || ""; opt_options.labelContent = opt_options.labelContent || "";
......
src/assets/css/newPersonalCenter/block/HomePage.css
View file @ 4e7c1839
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
position: relative; position: relative;
} }
.cro_left_top,.cro_right_top,.cro_left_bottom,.cro_right_bottom{ .top_info .cro_left_top,.top_info .cro_right_top,.top_info .cro_left_bottom,.top_info .cro_right_bottom{
position: absolute; position: absolute;
width: 20px; width: 20px;
height: 20px; height: 20px;
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
z-index: 1; z-index: 1;
background: #fff; background: #fff;
} }
.cro_left_top{ .top_info .cro_left_top{
top: -1px; top: -1px;
left: 50%; left: 50%;
border-radius:0px 0px 20px 0px; border-radius:0px 0px 20px 0px;
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
border-right: 1px solid rgba(230,230,230,1); border-right: 1px solid rgba(230,230,230,1);
} }
.cro_right_top{ .top_info .cro_right_top{
top: -21px; top: -21px;
right: -1px; right: -1px;
border-radius:0px 0px 0px 20px; border-radius:0px 0px 0px 20px;
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
border-left: 1px solid rgba(230,230,230,1); border-left: 1px solid rgba(230,230,230,1);
} }
.cro_left_bottom{ .top_info .cro_left_bottom{
left: 50%; left: 50%;
bottom: -1px; bottom: -1px;
border-radius:0px 20px 0px 0px; border-radius:0px 20px 0px 0px;
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
border-right: 1px solid rgba(230,230,230,1); border-right: 1px solid rgba(230,230,230,1);
} }
.cro_right_bottom{ .top_info .cro_right_bottom{
right: -1px; right: -1px;
bottom: -21px; bottom: -21px;
border-radius:20px 0px 0px 0px; border-radius:20px 0px 0px 0px;
...@@ -228,6 +228,9 @@ ...@@ -228,6 +228,9 @@
font-weight: bold; font-weight: bold;
} }
.order_info .el-table--enable-row-hover .el-table__body tr:hover>td{ .order_info .el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: #E6E6E6 !important;
}
.order_info .el-table--enable-row-hover .el-table__body tr.el-table__row:hover>td{
background-color: #FFF0F0 !important; background-color: #FFF0F0 !important;
} }
.order_info .order_table{ .order_info .order_table{
...@@ -282,6 +285,7 @@ ...@@ -282,6 +285,7 @@
width: 100%; width: 100%;
margin: 20px 0; margin: 20px 0;
cursor: pointer; cursor: pointer;
display: block;
} }
.guoqi_coupon{ .guoqi_coupon{
background:rgba(255,255,255,1); background:rgba(255,255,255,1);
......
src/assets/css/newPersonalCenter/block/OrderCenter.css
View file @ 4e7c1839
/* 跟团游 */
.OrderCenter>ul{ .OrderCenter>ul{
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
border-bottom: 1px solid #F2DADA; border-bottom: 1px solid #F2DADA;
margin-bottom: 10px;
} }
.OrderCenter>ul li{ .OrderCenter>ul li{
float: left; float: left;
...@@ -66,3 +68,11 @@ ...@@ -66,3 +68,11 @@
.OrderCenter .el-pager li.active{ .OrderCenter .el-pager li.active{
color: #f56c6c; color: #f56c6c;
} }
.OrderCenter ._row_2{
overflow: hidden;
text-overflow: ellipsis;
-webkit-line-clamp: 2;
word-break: break-all;
display: -webkit-box;
-webkit-box-orient: vertical;
}
\ No newline at end of file
src/assets/css/newPersonalCenter/integral.css
View file @ 4e7c1839
...@@ -56,4 +56,93 @@ ...@@ -56,4 +56,93 @@
color: #666666; color: #666666;
margin-top: 15px; margin-top: 15px;
line-height: 30px; line-height: 30px;
}
.integral_home .integral_commodity{
background-color: white;
border:1px solid rgba(236,236,236,1);
margin-bottom: 20px;
}
.integral_home .integral_commodity>._tit {
font-weight: bold;
font-family: 'FingFangR';
padding: 20PX;
border-bottom: 1px solid rgba(230,230,230,1);
}
.integral_home .integral_commodity>._tit{
display: flex;
align-items: center;
}
.integral_home .integral_commodity>._tit>.iconfont{
color: #FFB83C;
padding-right: 10PX;
}
.integral_commodity ._more{
flex: 2;
text-align: right;
color: #EE4454;
font-size: 12px;
}
.integral_commodity ._more .iconfont{
font-size: 12px;
}
.integral_commodity ._list{
display: flex;
padding: 40px 20px;
justify-content: space-around;
}
.integral_commodity ._list ._list_item{
text-align: center;
font-size: 12px;
}
.integral_commodity ._list ._list_item ._top_bg{
color: #FFFFFF;
height: 52px;
background: url(../../img/ps/quan1.png) no-repeat 0 100%/100% auto;
}
.integral_commodity ._list ._list_item ._top_bg._top_bg_1{
background: url(../../img/ps/quan2.png) no-repeat 0 100%/100% auto;
}
.integral_commodity ._list ._list_item ._top_bg ._price span{
font-size: 24px;
font-weight: bold;
font-family: 'FingFangR';
}
.integral_commodity ._list_item>p._name{
margin: 20px 0 10px 0;
}
.integral_commodity ._list_item>p._jifen{
color: #666666;
}
/* 我的积分明细 */
.integralDetail .integralDetail_row{
background-color: white;
padding: 13px 0;
padding-left: 10px;
display: flex;
border-bottom: 1px solid #F2DADA;
}
.integralDetail .integralDetail_row ._drop{
margin-right: 20px;
}
.integralDetail .integralDetail_row .el-date-editor{
width: 120px !important;
}
.integralDetail .integralDetail_row .el-date-editor input{
padding-right: 10px;
border-radius: 0;
}
.integralDetail .table_box{
margin-top: 15px;
background-color: white;
border: 1px solid rgba(230,230,230,1);
}
.integralDetail .table_box .inMoney{
color: #FF5F08;
}
.integralDetail .table_box .outMoney{
color: #67C23A;
}
.integralDetail .el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: #FFF0F0 !important;
} }
\ No newline at end of file
src/assets/mall/PsMyCoupon.css
View file @ 4e7c1839
...@@ -55,118 +55,3 @@ ...@@ -55,118 +55,3 @@
.PsMyCoupon ._el_tab_2 ul li.active{ .PsMyCoupon ._el_tab_2 ul li.active{
color: #E73828; color: #E73828;
} }
.PsMyCoupon ._content_item{
display: flex;
flex-wrap: wrap;
}
.PsMyCoupon ._content_item ._item{
width: 220px;
position: relative;
transition: all linear .5s;
overflow: hidden;
margin: 5px 4px;
}
.PsMyCoupon ._content_item ._item:hover{
box-shadow: 0px 1px 13px 0px rgb(189, 189, 189);
}
.PsMyCoupon ._content_item ._top{
background-color: #F1BC69;
}
.PsMyCoupon ._content_item ._top ._time{
color: #A7711C;
}
.PsMyCoupon ._content_item ._top._blue{
background-color: #8794E2;
}
.PsMyCoupon ._content_item ._top._blue ._time{
color: #4C58A4;
}
.PsMyCoupon ._content_item div._top._gray{
background-color: #C3C3C3 !important;
}
.PsMyCoupon ._content_item div._top._gray ._overdue,.PsMyCoupon ._content_item div._top._gray ._info_bottom{
display: none
}
.PsMyCoupon ._content_item div._top._gray ._info_sale{
color: #FFFFFF !important;
}
.PsMyCoupon ._content_item div._top._gray ._time{
color: #777777 !important;
}
.PsMyCoupon ._top_raduis{
display: flex;
justify-content: space-between;
}
.PsMyCoupon ._top_raduis span{
display: inline-block;
width: 8px;
height: 8px;
margin: 3px;
border-radius: 50%;
background-color: white;
margin-top: -4px;
}
.PsMyCoupon ._item ._top ._overdue{
background-color: #E9F026;
color: #666666;
padding: 4px 6px;
position: absolute;
left: 0;
top: 0;
font-size: 12px;
}
.PsMyCoupon ._item ._top ._info_details{
padding: 15px 10px;
}
.PsMyCoupon ._item ._top ._info_details ._info_sale{
font-size: 30px;
color: white;
}
.PsMyCoupon ._item ._top ._info_details ._info_sale span{
font-size: 20px;
color: white;
}
.PsMyCoupon ._item ._top ._info_details ._info_full{
color: #FFFFFF;
font-size: 12px;
padding: 5px 0;
}
.PsMyCoupon ._item ._top ._info_details ._info_time{
font-size: 12px;
}
.PsMyCoupon ._item ._top ._info_details ._info_bottom{
padding: 1px 5px;
color: #A7711C;
font-size: 12px;
position: absolute;
border: 1px solid #A7711C;
border-radius: 4px;
right: 13px;
top: 24px;
cursor: pointer;
}
.PsMyCoupon ._item ._bottom{
padding: 15px 10px;
background-color: #F9F9F9;
}
.PsMyCoupon ._item ._bottom p{
font-size: 12px;
color: #333333;
font-weight: bold;
margin-bottom: 13px;
}
.PsMyCoupon ._item ._bottom p._bottom_info{
color: #666666;
font-weight: 300;
}
.PsMyCoupon ._item ._bottom p._margin_bt0{
margin-bottom: 0 !important;
}
.PsMyCoupon p._info_coupon_name{
font-size: 18px !important;
max-width: 140px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: white;
}
\ No newline at end of file
src/components/ActivityCenter/TurnaroundDraw.vue
View file @ 4e7c1839
...@@ -531,7 +531,7 @@ export default { ...@@ -531,7 +531,7 @@ export default {
} }
//----绘制奖品开始---- //----绘制奖品开始----
var text = _this.turnplate.restaraunts[i].name; var text = _this.turnplate.restaraunts[i].name;
var line_height = 17; var line_height = 20;
//translate方法重新映射画布上的 (0,0) 位置 //translate方法重新映射画布上的 (0,0) 位置
ctx.translate( ctx.translate(
211 + Math.cos(angle + arc / 2) * _this.turnplate.textRadius, 211 + Math.cos(angle + arc / 2) * _this.turnplate.textRadius,
...@@ -542,31 +542,9 @@ export default { ...@@ -542,31 +542,9 @@ export default {
ctx.rotate(angle + arc / 2 + Math.PI / 2); ctx.rotate(angle + arc / 2 + Math.PI / 2);
/** 下面代码根据奖品类型、奖品名称长度渲染不同效果，如字体、颜色、图片效果。(具体根据实际情况改变) **/ /** 下面代码根据奖品类型、奖品名称长度渲染不同效果，如字体、颜色、图片效果。(具体根据实际情况改变) **/
if (text.indexOf("盘") > 0) { if (text.length > 1) {
//判断字符进行换行
var texts = text.split("盘");
for (var j = 0; j < texts.length; j++) {
ctx.font =
j == 0
? "bold 20px Microsoft YaHei"
: "bold 18px Microsoft YaHei";
if (j == 0) {
ctx.fillText(
texts[j] + "盘",
-ctx.measureText(texts[j] + "盘").width / 2,
j * line_height
);
} else {
ctx.fillText(
texts[j],
-ctx.measureText(texts[j]).width / 2,
j * line_height * 1.2
); //调整行间距
}
}
} else if (text.indexOf("盘") == -1 && text.length > 8) {
//奖品名称长度超过一定范围 //奖品名称长度超过一定范围
text = text.substring(0, 8) + "||" + text.substring(8); text = text.substring(0, 5) + "||" + text.substring(5);
var texts = text.split("||"); var texts = text.split("||");
for (var j = 0; j < texts.length; j++) { for (var j = 0; j < texts.length; j++) {
ctx.fillText( ctx.fillText(
......
src/components/global/pay.vue
View file @ 4e7c1839
<template> <template>
<div class="templatePayURL" style="display: inline-block; float: right; margin-right: 10px;"> <div class="templatePayURL" style="display: inline-block; float: right; margin-right: 10px; display: flex;">
<el-popover width="320" @hide='clearTimer'> <el-popover width="320" @hide='clearTimer'>
<div> <div>
<p style="margin:0 0 15px 0;">二维码收款</p> <p style="margin:0 0 15px 0;">二维码收款</p>
......
src/components/newPersonalCenter/block/MyCoupon.vue
View file @ 4e7c1839
...@@ -3,8 +3,9 @@ ...@@ -3,8 +3,9 @@
</style> </style>
<template> <template>
<!-- 优惠券 -->
<el-row class="MyCoupon"> <el-row class="MyCoupon">
<!-- 优惠券 --> <!-- 条件 -->
<el-row class="menu_list"> <el-row class="menu_list">
<ul class="clearfix"> <ul class="clearfix">
<li> <li>
...@@ -12,7 +13,7 @@ ...@@ -12,7 +13,7 @@
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<span class="__cp"> <span class="__cp">
{{dropdownText}} {{dropdownText}}
<i class="iconfont el-icon-arrow-down"></i> <i class="el-icon-arrow-down"></i>
</span> </span>
</span> </span>
<el-dropdown-menu class="changelanguage" slot="dropdown"> <el-dropdown-menu class="changelanguage" slot="dropdown">
...@@ -40,13 +41,16 @@ ...@@ -40,13 +41,16 @@
</li> </li>
</ul> </ul>
</el-row> </el-row>
<!-- 列表 -->
<el-row class="_table_box" v-loading="dataLoading"> <el-row class="_table_box" v-loading="dataLoading">
<div v-if="dataList.length>0" class="_content_item"> <div v-if="dataList.length>0" class="_content_item">
<div class="_item" v-for="(item, index) in dataList"> <template v-for="(item, index) in dataList">
<VCoupon :item='item'/>
</template>
<!-- <div class="_item" v-for="(item, index) in dataList">
<div <div
class="_top" class="_top"
:class="{'_blue':item.couponsType===1,'_gray':item.couponEffectStatus===3,}" :class="{'_blue':item.couponsType===1,'_gray':item.couponEffectStatus===3,}">
>
<div class="_top_raduis"> <div class="_top_raduis">
<span></span> <span></span>
<span></span> <span></span>
...@@ -90,7 +94,7 @@ ...@@ -90,7 +94,7 @@
<p class="_bottom_tit">优惠券来源</p> <p class="_bottom_tit">优惠券来源</p>
<p class="_bottom_info _margin_bt0">{{item.accessType === 1 ? '抽奖活动' : '其他'}}</p> <p class="_bottom_info _margin_bt0">{{item.accessType === 1 ? '抽奖活动' : '其他'}}</p>
</div> </div>
</div> </div> -->
</div> </div>
<div class="empty-data" v-else> <div class="empty-data" v-else>
<i class="iconfont icon-kong"></i> <i class="iconfont icon-kong"></i>
...@@ -110,8 +114,11 @@ ...@@ -110,8 +114,11 @@
</el-row> </el-row>
</template> </template>
<script> <script>
import Coupon from './model/SmallComponents/Coupon'
export default { export default {
components: {}, components: {
VCoupon: Coupon,
},
data() { data() {
return { return {
dropdownText: "通用", dropdownText: "通用",
...@@ -142,8 +149,8 @@ export default { ...@@ -142,8 +149,8 @@ export default {
this.getList() this.getList()
}, },
methods: { methods: {
// 获取数据
getList() { getList() {
// 获取数据
this.dataLoading = true; this.dataLoading = true;
this.apiJavaPost( this.apiJavaPost(
"/api/b2b/user/getUserCouponAllotList", "/api/b2b/user/getUserCouponAllotList",
...@@ -173,8 +180,8 @@ export default { ...@@ -173,8 +180,8 @@ export default {
null null
); );
}, },
//页面跳转
goUrl(path,bl){ goUrl(path,bl){
// console.log("path",path)
if(path=='heel'){ if(path=='heel'){
sessionStorage.setItem("defaultKey",'2-1'); sessionStorage.setItem("defaultKey",'2-1');
this.$emit('forword', '2-1') this.$emit('forword', '2-1')
...@@ -183,11 +190,12 @@ export default { ...@@ -183,11 +190,12 @@ export default {
this.$store.commit('HomePage',bl) this.$store.commit('HomePage',bl)
this.$router.push({name:path}); this.$router.push({name:path});
}, },
resetPageIndex() {//查询初始化页码 //查询初始化页码
resetPageIndex() {
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
}, },
// 翻页
handleCurrentChange(val) { handleCurrentChange(val) {
// 翻页
this.msg.pageIndex = parseInt(val); this.msg.pageIndex = parseInt(val);
this.getList(); this.getList();
} }
......
src/components/newPersonalCenter/block/OrderCenter.vue
View file @ 4e7c1839
<style> <style>
@import "../../../assets/css/newPersonalCenter/block/OrderCenter.css";
</style> </style>
<template> <template>
<el-row class="OrderCenter"> <!-- 订单中心 -->
<ul class="clearfix"> <div>
<template v-for="item in TitList"> <!-- 团订单 -->
<li <TcOrder v-if="data === '8-1'"/>
class="__cp" <!-- 机票订单 -->
@click="handleClick(item)" <TkOrder v-if="data === '8-5'"/>
:class="{_active: activeName === item.ID}" </div>
>{{item.Type}}</li>
</template>
</ul>
<el-row class="table_box">
<el-table :data="tableData" style="width: 100%">
<el-table-column prop="orderId" label="订单号" width="80"></el-table-column>
<el-table-column prop="title" label="团名" width="180">
<template slot-scope="scope">
<el-tooltip class="item" popper-class="w180" effect="dark" :content="scope.row.title" placement="bottom-end">
<p class="_row_2">{{scope.row.title}}</p>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="startDate" label="团期"></el-table-column>
<el-table-column prop="guestNum" label="人数" width="80"></el-table-column>
<el-table-column prop="preferPrice" label="金额" width="80"></el-table-column>
<el-table-column prop="orderState" label="订单状态" width="100">
<template slot-scope="scope">
<span v-if="scope.row.orderState === 1">待付定金</span>
<span v-else-if="scope.row.orderState === 2">待付尾款</span>
<span v-else-if="scope.row.orderState === 3">待发团</span>
<span v-else-if="scope.row.orderState === 4">交易完成</span>
<span v-else-if="scope.row.orderState === 0">取消</span>
</template>
</el-table-column>
<!-- 操作按钮 -->
<el-table-column align="left" label="操作">
<template slot-scope="scope">
<payurlItem
v-if="scope.row.orderState !== 0 && scope.row.orderState !== 4"
@b2b_get_GetWaitDealOrderPageList="b2b_get_GetWaitDealOrderPageList"
:item="scope.row"
></payurlItem>
</template>
</el-table-column>
</el-table>
<div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
</el-row>
<!-- 分页 -->
<el-row class="_pagination" v-if="totalCount > 1 && tableData.length>0">
<el-pagination
:current-page.sync="currentPage"
:page-size="getOrderMsg.pageSize"
layout="total, prev, pager, next"
:total="Count"
@current-change="handleCurrentChange"
></el-pagination>
</el-row>
</el-row>
</template> </template>
<script> <script>
import payURL from "../../global/pay.vue"; import TcOrder from './model/TcOrder'
import TkOrder from './model/TkOrder'
export default { export default {
props:{
data: ''
},
components: { components: {
payurlItem: payURL TcOrder: TcOrder,
TkOrder: TkOrder,
}, },
data() { data() {
return { return {
activeName: -1,
currentPage: 1,
rderLoading: false,
totalCount: 1,
Count: 1,
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
orderType: 1,
queryDays: 0,
orderState: -1,
CustomerId: ""
},
TitList: [
{
Type: "全部",
ID: -1
},
{
Type: "待付定金",
ID: 1
},
{
Type: "待付尾款",
ID: 2
},
{
Type: "待发团",
ID: 3
},
{
Type: "交易完成",
ID: 4
},
{
Type: "取消",
ID: 5
}
// {
// val: 6,
// lable: '等待商家确认'
// },
// {
// val: 7,
// lable: '退款中'
// },
// {
// val: 8,
// lable: '退款成功'
// },
// {
// val: 9,
// lable: '交易完成'
// },
],
tableData: []
}; };
}, },
computed: {}, computed: {},
created() {}, created() {},
mounted() { mounted() {
let userInfo = localStorage.userInfo
? JSON.parse(localStorage.userInfo)
: "";
this.getOrderMsg.CustomerId = userInfo.customerId;
this.gerOrderList();
this.b2b_get_GetWaitDealOrderPageList();
}, },
methods: { methods: {
b2b_get_GetWaitDealOrderPageList() {
//获取待处理订单
let msg = {
pageIndex: 1,
pageSize: 100
};
this.apipost(
"b2b_get_GetWaitDealOrderPageList",
msg,
r => {
console.log("r",r);
if (r.data.resultCode == 1) {
this.WaitDealOrderPageList = r.data.data.pageData;
} else {
this.$message.error(r.data.message);
}
},
null
);
},
gerOrderList: function() {
this.orderLoading = true;
this.apiJavaPost(
"/api/b2b/user/getrecentorder",
this.getOrderMsg,
res => {
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count;
this.orderLoading = false;
} else {
this.Error(res.data.message);
this.orderLoading = false;
}
},
null
);
},
handleClick(item) {
this.activeName = item.ID;
this.getOrderMsg.orderState = item.ID;
this.gerOrderList();
},
handleCurrentChange(val) {
// 翻页
this.getOrderMsg.pageIndex = parseInt(val);
this.gerOrderList();
}
} }
}; };
</script> </script>
\ No newline at end of file
src/components/newPersonalCenter/block/model/OrderInfo.vue
View file @ 4e7c1839
<style> <style>
</style> </style>
<template> <template>
<el-row class="order_info"> <el-row class="order_info">
...@@ -56,38 +57,12 @@ ...@@ -56,38 +57,12 @@
</el-row> </el-row>
<!-- 订单表格 --> <!-- 订单表格 -->
<el-row class="order_table" v-loading="orderLoading"> <el-row class="order_table" v-loading="orderLoading">
<el-table :data="tableData" style="width: 100%"> <template v-if="tableData.length>0">
<el-table-column prop="orderId" label="订单号" width="80"></el-table-column> <!-- 团订单表格 -->
<el-table-column prop="title" label="团名" width="180"> <TCTable v-if="getOrderMsg.orderType === 1" :tableData ="tableData"/>
<template slot-scope="scope"> <!-- 机票订单表格 -->
<el-tooltip class="item" popper-class="w180" effect="dark" :content="scope.row.title" placement="bottom-end"> <TKTable v-else-if="getOrderMsg.orderType === 4" :tableData ="tableData"/>
<p class="_row_2">{{scope.row.title}}</p> </template>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="startDate" label="团期"></el-table-column>
<el-table-column prop="guestNum" label="人数" width="80"></el-table-column>
<el-table-column prop="preferPrice" label="金额" width="80"></el-table-column>
<el-table-column prop="orderState" label="订单状态" width="100">
<template slot-scope="scope">
<span v-if="scope.row.orderState === 1">待付定金</span>
<span v-else-if="scope.row.orderState === 2">待付尾款</span>
<span v-else-if="scope.row.orderState === 3">待发团</span>
<span v-else-if="scope.row.orderState === 4">交易完成</span>
<span v-else-if="scope.row.orderState === 0">取消</span>
</template>
</el-table-column>
<!-- 操作按钮 -->
<el-table-column align="left" label="操作">
<template slot-scope="scope">
<payurlItem
v-if="scope.row.orderState !== 0 && scope.row.orderState !== 4"
@b2b_get_GetWaitDealOrderPageList="b2b_get_GetWaitDealOrderPageList"
:item="scope.row"
></payurlItem>
</template>
</el-table-column>
</el-table>
<div class="empty-data" v-if="tableData.length<1"> <div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i> <i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了 很抱歉，你想要的信息我们真的找不到了
...@@ -107,10 +82,13 @@ ...@@ -107,10 +82,13 @@
</template> </template>
<script> <script>
import payURL from "../../../global/pay.vue";
import TCTable from "./OrderInfoModel/TCTable";
import TKTable from "./OrderInfoModel/TKTable";
export default { export default {
components: { components: {
payurlItem: payURL TCTable: TCTable,
TKTable: TKTable,
}, },
data() { data() {
return { return {
...@@ -215,25 +193,6 @@ export default { ...@@ -215,25 +193,6 @@ export default {
this.gerOrderList() this.gerOrderList()
}, },
methods: { methods: {
b2b_get_GetWaitDealOrderPageList() {
//获取待处理订单
let msg = {
pageIndex: 1,
pageSize: 100
};
this.apipost(
"b2b_get_GetWaitDealOrderPageList",
msg,
r => {
if (r.data.resultCode == 1) {
this.WaitDealOrderPageList = r.data.data.pageData;
} else {
this.$message.error(r.data.message);
}
},
null
);
},
// 获取列表 // 获取列表
gerOrderList: function() { gerOrderList: function() {
this.orderLoading = true; this.orderLoading = true;
......
src/components/newPersonalCenter/block/model/OrderInfoModel/TCTable.vue 0 → 100644
View file @ 4e7c1839
<style>
</style>
<template>
<el-row>
<el-table :data="tableData" style="width: 100%">
<el-table-column prop="orderId" label="订单号" width="80"></el-table-column>
<el-table-column prop="title" label="团名" width="180">
<template slot-scope="scope">
<el-tooltip class="item" popper-class="w180" effect="dark" :content="scope.row.title" placement="bottom-end">
<p class="_row_2">{{scope.row.title}}</p>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="startDate" label="团期"></el-table-column>
<el-table-column prop="guestNum" label="人数" width="80"></el-table-column>
<el-table-column prop="preferPrice" label="金额" width="80"></el-table-column>
<el-table-column prop="orderState" label="订单状态" width="100">
<template slot-scope="scope">
<span v-if="scope.row.orderState === 1">待付定金</span>
<span v-else-if="scope.row.orderState === 2">待付尾款</span>
<span v-else-if="scope.row.orderState === 3">待发团</span>
<span v-else-if="scope.row.orderState === 4">交易完成</span>
<span v-else-if="scope.row.orderState === 0">取消</span>
</template>
</el-table-column>
<!-- 操作按钮 -->
<el-table-column align="left" label="操作">
<template slot-scope="scope">
<payurlItem
v-if="scope.row.orderState !== 0 && scope.row.orderState !== 4"
@b2b_get_GetWaitDealOrderPageList="b2b_get_GetWaitDealOrderPageList"
:item="scope.row"
></payurlItem>
</template>
</el-table-column>
</el-table>
</el-row>
</template>
<script>
import payURL from "../../../../global/pay.vue";
export default {
components: {
payurlItem: payURL,
},
props:["tableData"],
data() {
return {};
},
mounted() {},
methods: {
b2b_get_GetWaitDealOrderPageList() {
//获取待处理订单
let msg = {
pageIndex: 1,
pageSize: 100
};
this.apipost(
"b2b_get_GetWaitDealOrderPageList",
msg,
r => {
if (r.data.resultCode == 1) {
this.WaitDealOrderPageList = r.data.data.pageData;
} else {
this.$message.error(r.data.message);
}
},
null
);
},
}
};
</script>
src/components/newPersonalCenter/block/model/OrderInfoModel/TKTable.vue 0 → 100644
View file @ 4e7c1839
<style>
.TKTable .el-table__expanded-cell[class*=cell]{
padding: 20px;
background-color: #E6E6E6;
}
.TKTable .tk_info{
position: relative;
background-color: white;
}
.TKTable .tk_info_left{
padding: 20px;
position: relative;
}
.TKTable .tk_info_left ._tit>span:nth-child(1){
width:30px;
height:30px;
background:rgba(73,192,161,1);
display: inline-block;
font-size: 12px;
line-height: 30px;
text-align: center;
color: white;
}
.TKTable .tk_info_left ._tit>span:nth-child(2),.TKTable .tk_info_left ._tit>span:nth-child(3){
font-size:16px;
font-family: 'PingFangR';
font-weight:bold;
color:rgba(51,51,51,1);
padding: 0 15px;
}
.TKTable .tk_info_left ._tit>span:nth-child(3){
padding-left: 0;
}
.TKTable ._tit_s_name{
font-size: 12px;
margin-top: 20px;
display: flex;
align-items: center;
color: #333333;
}
.TKTable ._tit_s_name img{
width: 24px;
height: 24px;
display: inline-block;
margin-right: 10px;
}
.TKTable ._tit_s_name2{
width: 121px;
border-right: 1px dotted #999999;
padding: 5px 0;
margin: 0;
}
.TKTable ._fit_info{
padding: 0 10px;
font-size: 12px;
color: #333333;
line-height: 40px;
background:rgba(245,245,245,1);
position: relative;
display: flex;
margin-top: 5px;
}
.TKTable ._fit_info ._time{
display: inline-block;
width: 110px;
border-right: 1px solid #999999;
position: relative;
}
.TKTable ._fit_info ._time::before{
content: '';
display: inline-block;
background-color: #000000;
height: 5px;
width: 5px;
border-radius: 50%;
position: absolute;
right: -3px;
top: 18px;
}
.TKTable ._fit_info ._name{
display: inline-block;
padding-left: 15px;
}
.TKTable ._fit_info2{
margin: 0;
}
.TKTable .cro_left_top,.TKTable .cro_right_top,.TKTable .cro_left_bottom,.TKTable .cro_right_bottom{
position: absolute;
width: 15px;
height: 15px;
border: 1px solid #e6e6e6;
z-index: 1;
background: #e6e6e6;
}
.TKTable .cro_left_top{
top: -1px;
left: 0;
border-radius:0px 0px 20px 0px;
border-bottom: 1px solid #fff;
border-right: 1px solid #fff;
}
.TKTable .cro_right_top{
top: -1px;
right: -1px;
border-radius:0px 0px 0px 20px;
border-bottom: 1px solid #fff;
border-left: 1px solid #fff;
}
.TKTable .cro_left_bottom{
left: 0;
bottom: -2px;
border-radius:0px 20px 0px 0px;
border-top: 1px solid #fff;
border-right: 1px solid #fff;
}
.TKTable .cro_right_bottom{
right: -1px;
bottom: -1px;
border-radius:20px 0px 0px 0px;
border-top: 1px solid #fff;
border-left: 1px solid #fff;
}
.TKTable .tk_info_right .tk_info_right_list{
padding: 21px;
font-size: 12px;
}
.TKTable .tk_info_right .tk_info_right_list ._tit{
font-size:14px;
font-family: 'PingFangR';
font-weight:bold;
color:rgba(51,51,51,1);
}
.TKTable .tk_info_right .tk_info_right_list>div{
margin-top: 10px;
line-height: 32px;
}
.TKTable .tk_info_right .tk_info_right_list>div>p>span:nth-child(1){
display: inline-block;
width: 60px;
text-align: left;
color: #8590A0;
}
.TKTable .tk_info_right{
position: relative;
}
.TKTable .tk_info_right ._money{
color: #FF5F08;
}
</style>
<template>
<el-row class="TKTable">
<el-table :data="tableData" style="width: 100%">
<el-table-column type="expand">
<template slot-scope="scope">
<el-row class="tk_info">
<el-col :span="18" class="tk_info_left">
<div class="cro_right_top"></div>
<div class="cro_right_bottom"></div>
<el-row>
<el-col :span="12" v-for="(item, index) in scope.row.airticket" :key="index">
<div class="_tit">
<span>{{index === scope.row.airticket.length -1 ? '回程' : '去程'}}</span>
<span>{{item.ticketDepartureTime}}</span>
<span>{{item.departureName}}-{{item.arrivalName}}</span>
</div>
<div class="_tit_s_name">
<img src="../../../../../assets/img/king.png" alt="">
{{item.alName}}
</div>
<div class="_fit_info">
<span class="_time">{{item.flightDate | YMD}} {{item.ticketDepartureTime}}</span>
<span class="_name">{{item.departureName}} {{item.departurePortName}}</span>
</div>
<div class="_tit_s_name _tit_s_name2">
<img src="../../../../../assets/img/king.png" alt="">
{{item.alName}}
</div>
<div class="_fit_info _fit_info2">
<span class="_time">{{item.flightDate | YMD}} {{item.ticketArrivalTime}}</span>
<span class="_name">{{item.arrivalName}} {{item.arrivalPortName}}</span>
</div>
</el-col>
<!-- <el-col :span="12">
<div class="_tit">
<span>去程</span>
<span>2019-02-19</span>
<span>成都-泰国</span>
</div>
<div class="_tit_s_name">
<img src="../../../../../assets/img/king.png" alt="">
中国航空
</div>
<div class="_fit_info">
<span class="_time">02月19日 15:30</span>
<span class="_name">成都 CTU 双流国际机场</span>
</div>
<div class="_tit_s_name _tit_s_name2">
<img src="../../../../../assets/img/king.png" alt="">
中国航空
</div>
<div class="_fit_info _fit_info2">
<span class="_time">02月19日 15:30</span>
<span class="_name">成都 CTU 双流国际机场</span>
</div>
</el-col> -->
</el-row>
</el-col>
<el-col :span="6" class="tk_info_right">
<div class="cro_left_top"></div>
<div class="cro_left_bottom"></div>
<div class="tk_info_right_list">
<p class="_tit">其他信息</p>
<div>
<p><span>销售名称</span><span>{{scope.row.serviceName}}</span></p>
<p><span>销售电话</span><span>{{scope.row.servicePhone}}</span></p>
<p><span>已收金额</span><span class="_money">￥{{scope.row.income}}</span></p>
<p><span>供应商</span><span>{{scope.row.branchId}}</span></p>
<p><span>报入时间</span><span>{{scope.row.createDate}}</span></p>
</div>
</div>
</el-col>
</el-row>
</template>
</el-table-column>
<el-table-column prop="orderId" label="订单号" width="80"></el-table-column>
<el-table-column prop="guestNum" label="订单人数" width="80"></el-table-column>
<el-table-column prop="preferPrice" label="订单金额" width="80"></el-table-column>
<el-table-column prop="guestNum" label="出发日期" width="180">
<template slot-scope="scope">
<span>{{scope.row.startDate | YMD}}-{{scope.row.airticket[0].ticketDepartureTime}}</span>
</template>
</el-table-column>
<el-table-column prop="preferPrice" label="航班公司&航班号">
<template slot-scope="scope">
<span>{{`${scope.row.airticket[0].alName}-${scope.row.airticket[0].flightNumber}`}}</span>
</template>
</el-table-column>
<el-table-column prop="orderState" label="订单状态" width="100">
<template slot-scope="scope">
<span v-if="scope.row.orderState === 1">待付定金</span>
<span v-else-if="scope.row.orderState === 2">待付尾款</span>
<span v-else-if="scope.row.orderState === 3">待发团</span>
<span v-else-if="scope.row.orderState === 4">交易完成</span>
<span v-else-if="scope.row.orderState === 0">取消</span>
</template>
</el-table-column>
<!-- 操作按钮 -->
<el-table-column align="left" label="操作">
<template slot-scope="scope">
<payurlItem
v-if="scope.row.orderState !== 0 && scope.row.orderState !== 4"
@b2b_get_GetWaitDealOrderPageList="b2b_get_GetWaitDealOrderPageList"
:item="scope.row"
></payurlItem>
</template>
</el-table-column>
</el-table>
</el-row>
</template>
<script>
import payURL from "../../../../global/pay.vue";
export default {
components: {
payurlItem: payURL,
},
props:["tableData"],
data() {
return {};
},
mounted() {},
methods: {
b2b_get_GetWaitDealOrderPageList() {
//获取待处理订单
let msg = {
pageIndex: 1,
pageSize: 100
};
this.apipost(
"b2b_get_GetWaitDealOrderPageList",
msg,
r => {
if (r.data.resultCode == 1) {
this.WaitDealOrderPageList = r.data.data.pageData;
} else {
this.$message.error(r.data.message);
}
},
null
);
},
}
};
</script>
src/components/newPersonalCenter/block/model/OverCoupon.vue
View file @ 4e7c1839
...@@ -12,11 +12,13 @@ ...@@ -12,11 +12,13 @@
</div> </div>
</el-row> </el-row>
<el-row class="_my_coupon"> <el-row class="_my_coupon">
<div class="_item" v-for="(item, index) in couponList"> <template v-for="(item, index) in couponList">
<VCoupon v-if="index < 4" :item='item'/>
</template>
<!-- <div class="_item" v-for="(item, index) in couponList">
<div <div
class="_top" class="_top"
:class="{'_blue':item.couponsType===1,'_gray':item.couponEffectStatus===3,}" :class="{'_blue':item.couponsType===1,'_gray':item.couponEffectStatus===3,}" >
>
<div class="_top_raduis"> <div class="_top_raduis">
<span></span> <span></span>
<span></span> <span></span>
...@@ -58,7 +60,7 @@ ...@@ -58,7 +60,7 @@
<p class="_bottom_tit">优惠券来源</p> <p class="_bottom_tit">优惠券来源</p>
<p class="_bottom_info _margin_bt0">{{item.accessType === 1 ? '抽奖活动' : '其他'}}</p> <p class="_bottom_info _margin_bt0">{{item.accessType === 1 ? '抽奖活动' : '其他'}}</p>
</div> </div>
</div> </div> -->
<div class="empty-data" v-if="couponList.length<1"> <div class="empty-data" v-if="couponList.length<1">
<i class="iconfont icon-kong"></i> <i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了 很抱歉，你想要的信息我们真的找不到了
...@@ -68,13 +70,16 @@ ...@@ -68,13 +70,16 @@
</template> </template>
<script> <script>
import Coupon from './SmallComponents/Coupon'
export default { export default {
components: {}, components: {
VCoupon: Coupon,
},
data() { data() {
return { return {
getCouponMsg: { getCouponMsg: {
pageIndex: 1, pageIndex: 1,
pageSize: 4, pageSize: 1000,
useState: 1, useState: 1,
lineId: 0, lineId: 0,
lineteamId: 0, lineteamId: 0,
...@@ -102,17 +107,20 @@ export default { ...@@ -102,17 +107,20 @@ export default {
this.getCouponMsg, this.getCouponMsg,
res => { res => {
let nowTime = this.getNowDate(); let nowTime = this.getNowDate();
let couponList = [];
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data.pageData; let data = res.data.data.pageData;
data.forEach((x, i) => { data.forEach((x, i) => {
let cha = this.DateDiff(nowTime, x.expirationDate); let cha = this.DateDiff(nowTime, x.expirationDate);
console.log(cha)
if (cha < 10) { if (cha < 10) {
x.warning = true; x.warning = true;
couponList.push(x)
} else { } else {
x.warning = false; x.warning = false;
} }
}); });
this.couponList = data; this.couponList = couponList;
this.$forceUpdate(); this.$forceUpdate();
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
......
src/components/newPersonalCenter/block/model/TcOrder.vue 0 → 100644
View file @ 4e7c1839
<style>
@import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css";
</style>
<template>
<el-row class="OrderCenter">
<!-- 条件 -->
<ul class="clearfix">
<template v-for="item in TitList">
<li
class="__cp"
@click="handleClick(item)"
:class="{_active: activeName === item.ID}"
>{{item.Type}}</li>
</template>
</ul>
<!-- 表格 -->
<TCTable :tableData ="tableData"/>
<div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
<!-- 分页 -->
<el-row class="_pagination" v-if="totalCount > 1 && tableData.length>0">
<el-pagination
:current-page.sync="currentPage"
:page-size="getOrderMsg.pageSize"
layout="total, prev, pager, next"
:total="Count"
@current-change="handleCurrentChange"
></el-pagination>
</el-row>
</el-row>
</template>
<script>
import TCTable from "./OrderInfoModel/TCTable";
export default {
components: {
TCTable: TCTable
},
data() {
return {
activeName: -1,
currentPage: 1,
rderLoading: false,
totalCount: 1,
Count: 1,
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
orderType: 1,
queryDays: 0,
orderState: -1,
CustomerId: ""
},
TitList: [
{
Type: "全部",
ID: -1
},
{
Type: "待付定金",
ID: 1
},
{
Type: "待付尾款",
ID: 2
},
{
Type: "待发团",
ID: 3
},
{
Type: "交易完成",
ID: 4
},
{
Type: "取消",
ID: 5
}
// {
// val: 6,
// lable: '等待商家确认'
// },
// {
// val: 7,
// lable: '退款中'
// },
// {
// val: 8,
// lable: '退款成功'
// },
// {
// val: 9,
// lable: '交易完成'
// },
],
tableData: []
};
},
computed: {},
created() {},
mounted() {
let userInfo = localStorage.userInfo
? JSON.parse(localStorage.userInfo)
: "";
this.getOrderMsg.CustomerId = userInfo.customerId;
this.gerOrderList();
this.b2b_get_GetWaitDealOrderPageList();
},
methods: {
b2b_get_GetWaitDealOrderPageList() {
//获取待处理订单
let msg = {
pageIndex: 1,
pageSize: 100
};
this.apipost(
"b2b_get_GetWaitDealOrderPageList",
msg,
r => {
if (r.data.resultCode == 1) {
this.WaitDealOrderPageList = r.data.data.pageData;
} else {
this.$message.error(r.data.message);
}
},
null
);
},
gerOrderList: function() {
this.orderLoading = true;
this.apiJavaPost(
"/api/b2b/user/getrecentorder",
this.getOrderMsg,
res => {
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count;
this.orderLoading = false;
} else {
this.Error(res.data.message);
this.orderLoading = false;
}
},
null
);
},
handleClick(item) {
this.activeName = item.ID;
this.getOrderMsg.orderState = item.ID;
this.gerOrderList();
},
handleCurrentChange(val) {
// 翻页
this.getOrderMsg.pageIndex = parseInt(val);
this.gerOrderList();
}
}
};
</script>
src/components/newPersonalCenter/block/model/TkOrder.vue 0 → 100644
View file @ 4e7c1839
<style>
@import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css";
</style>
<template>
<el-row class="OrderCenter">
<!-- 条件 -->
<ul class="clearfix">
<template v-for="item in TitList">
<li
class="__cp"
@click="handleClick(item)"
:class="{_active: activeName === item.ID}"
>{{item.Type}}</li>
</template>
</ul>
<!-- 表格 -->
<TKTable :tableData="tableData"/>
<div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
<!-- 分页 -->
<el-row class="_pagination" v-if="totalCount > 1 && tableData.length>0">
<el-pagination
:current-page.sync="currentPage"
:page-size="getOrderMsg.pageSize"
layout="total, prev, pager, next"
:total="Count"
@current-change="handleCurrentChange"
></el-pagination>
</el-row>
</el-row>
</template>
<script>
import TKTable from "./OrderInfoModel/TKTable";
export default {
components: {
TKTable: TKTable
},
data() {
return {
activeName: -1,
currentPage: 1,
rderLoading: false,
totalCount: 1,
Count: 1,
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
orderType: 4,
queryDays: 0,
orderState: -1,
CustomerId: ""
},
TitList: [
{
Type: "全部",
ID: -1
},
{
Type: "待付定金",
ID: 1
},
{
Type: "待付尾款",
ID: 2
},
{
Type: "待发团",
ID: 3
},
{
Type: "交易完成",
ID: 4
},
{
Type: "取消",
ID: 5
}
// {
// val: 6,
// lable: '等待商家确认'
// },
// {
// val: 7,
// lable: '退款中'
// },
// {
// val: 8,
// lable: '退款成功'
// },
// {
// val: 9,
// lable: '交易完成'
// },
],
tableData: []
};
},
computed: {},
created() {},
mounted() {
let userInfo = localStorage.userInfo
? JSON.parse(localStorage.userInfo)
: "";
this.getOrderMsg.CustomerId = userInfo.customerId;
this.gerOrderList();
this.b2b_get_GetWaitDealOrderPageList();
},
methods: {
b2b_get_GetWaitDealOrderPageList() {
//获取待处理订单
let msg = {
pageIndex: 1,
pageSize: 100
};
this.apipost(
"b2b_get_GetWaitDealOrderPageList",
msg,
r => {
if (r.data.resultCode == 1) {
this.WaitDealOrderPageList = r.data.data.pageData;
} else {
this.$message.error(r.data.message);
}
},
null
);
},
gerOrderList: function() {
this.orderLoading = true;
this.apiJavaPost(
"/api/b2b/user/getrecentorder",
this.getOrderMsg,
res => {
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count;
this.orderLoading = false;
} else {
this.Error(res.data.message);
this.orderLoading = false;
}
},
null
);
},
handleClick(item) {
this.activeName = item.ID;
this.getOrderMsg.orderState = item.ID;
this.gerOrderList();
},
handleCurrentChange(val) {
// 翻页
this.getOrderMsg.pageIndex = parseInt(val);
this.gerOrderList();
}
}
};
</script>
src/components/newPersonalCenter/integral/model/exchange.vue
View file @ 4e7c1839
...@@ -2,8 +2,23 @@ ...@@ -2,8 +2,23 @@
</style> </style>
<template> <template>
<div> <div class="exchange">
我的兑换 <!-- 查询条件 -->
<el-row class="integralDetail_row">
<div class="__cp _drop">
<el-dropdown trigger="click" @command="handleCommandOne">
<span class="el-dropdown-link">
{{Name}}
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<template v-for="item in TypeList">
<el-dropdown-item :command="item">{{item.Name}}</el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
</div>
</el-row>
</div> </div>
</template> </template>
<script> <script>
...@@ -14,8 +29,30 @@ export default { ...@@ -14,8 +29,30 @@ export default {
props:{}, props:{},
data(){ data(){
return{ return{
Name: '全部',
TypeList: [
{
ID: -1,
Name: '全部'
},
{
ID: 1,
Name: '收入'
},
{
ID: 2,
Name: '支出'
},
],
} }
},
mounted(){
},methods:{
handleCommandOne(command) {
this.Type = command.ID;
this.Name = command.Name;
},
} }
} }
</script> </script>
src/components/newPersonalCenter/integral/model/integralDetail.vue
View file @ 4e7c1839
...@@ -2,8 +2,80 @@ ...@@ -2,8 +2,80 @@
</style> </style>
<template> <template>
<div> <!-- 积分明细 -->
积分详情 <div class="integralDetail">
<!-- 查询条件 -->
<el-row class="integralDetail_row">
<div class="__cp _drop">
<el-dropdown trigger="click" @command="handleCommandOne">
<span class="el-dropdown-link">
{{Name}}
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<template v-for="item in TypeList">
<el-dropdown-item :command="item">{{item.Name}}</el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
</div>
<div>
<el-date-picker
class="w120"
size="mini"
v-model="value2"
type="date"
placeholder="请选择日期">
</el-date-picker>
</div>
</el-row>
<!-- 列表 -->
<el-row class="table_box">
<el-table
:data="tableData"
style="width: 100%">
<el-table-column
prop="date"
label="日期"
width="180">
</el-table-column>
<el-table-column
prop="pay"
label="收入/支出"
width="180">
<template slot-scope="scope">
<span v-if="scope.row.pay === 1">收入</span>
<span v-else>支出</span>
</template>
</el-table-column>
<el-table-column
prop="integral"
label="积分">
<template slot-scope="scope">
<span v-if="scope.row.pay === 1" class="inMoney">+{{scope.row.integral}}</span>
<span v-else class="outMoney">-{{scope.row.integral}}</span>
</template>
</el-table-column>
<el-table-column
prop="remark"
label="备注">
</el-table-column>
</el-table>
<div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
<!-- 分页 -->
<el-row class="_pagination" v-if="totalCount > 1 && tableData.length>0">
<el-pagination
:current-page.sync="currentPage"
:page-size="getOrderMsg.pageSize"
layout="total, prev, pager, next"
:total="Count"
@current-change="handleCurrentChange"
></el-pagination>
</el-row>
</el-row>
</div> </div>
</template> </template>
<script> <script>
...@@ -14,8 +86,61 @@ export default { ...@@ -14,8 +86,61 @@ export default {
props:{}, props:{},
data(){ data(){
return{ return{
Name: '全部',
Type: -1,
value2: '',
currentPage: 1,
totalCount: 1,
Count: 1,
pageSize: 1,
tableData: [
{
date: '2016-05-02',
pay: 1,
integral: 6,
remark: '签到'
}, {
date: '2016-05-04',
pay: 2,
integral: 200,
remark: '兑换奖品'
}, {
date: '2016-05-01',
pay: 2,
integral: 168,
remark: '兑换奖品'
}, {
date: '2016-05-03',
pay: 1,
integral: 250,
remark: '跟团游订单交易'
}
],
TypeList: [
{
ID: -1,
Name: '全部'
},
{
ID: 1,
Name: '收入'
},
{
ID: 2,
Name: '支出'
},
],
} }
},methods: {
// 翻页
handleCurrentChange(val) {
this.getOrderMsg.pageIndex = parseInt(val);
this.gerOrderList();
},
handleCommandOne(command) {
this.Type = command.ID;
this.Name = command.Name;
},
} }
} }
</script> </script>
src/components/newPersonalCenter/integral/model/integralHome.vue
View file @ 4e7c1839
<template> <template>
<!-- 积分首页 -->
<div class="integral_home"> <div class="integral_home">
<el-row class="integral_banner"> <el-row class="integral_banner">
<img src="../../../../assets/img/ps/banner.png" alt="">
</el-row> </el-row>
<!-- 中间板块 -->
<el-row class="integral_detail"> <el-row class="integral_detail">
<el-col :span="8" class="integral_detail_left"> <el-col :span="8" class="integral_detail_left">
<div> <div>
...@@ -34,6 +36,59 @@ ...@@ -34,6 +36,59 @@
</el-row> </el-row>
</el-col> </el-col>
</el-row> </el-row>
热门兑换
<el-row class="integral_commodity">
<div class="_tit">
<i class="iconfont icon-youhuiquanico"></i>
<span>热门兑换商品</span>
<span class="_more __cp">
更多 &nbsp;
<i class="iconfont icon-ico_right"></i>
</span>
</div>
<div class="_list">
<div class="_list_item">
<div class="_top_bg _top_bg_1">
<p class="_price"><span>8.8</span> %</p>
<p class="">优惠券</p>
</div>
<p class="_name">8.8折优惠券</p>
<p class="_jifen">兑换价：1000积分</p>
</div>
<div class="_list_item">
<div class="_top_bg _top_bg_1">
<p class="_price"><span>8.8</span> %</p>
<p class="">优惠券</p>
</div>
<p class="_name">8.8折优惠券</p>
<p class="_jifen">兑换价：1000积分</p>
</div>
<div class="_list_item">
<div class="_top_bg ">
<p class="_price">￥ <span>10</span> </p>
<p class="">现金券</p>
</div>
<p class="_name">10元现金券</p>
<p class="_jifen">兑换价：1000积分</p>
</div>
<div class="_list_item">
<div class="_top_bg ">
<p class="_price">￥ <span>10</span> </p>
<p class="">现金券</p>
</div>
<p class="_name">10元现金券</p>
<p class="_jifen">兑换价：1000积分</p>
</div>
<div class="_list_item">
<div class="_top_bg ">
<p class="_price">￥ <span>10</span> </p>
<p class="">现金券</p>
</div>
<p class="_name">10元现金券</p>
<p class="_jifen">兑换价：1000积分</p>
</div>
</div>
</el-row>
</div> </div>
</template> </template>
<script> <script>
......
src/components/newPersonalCenter/newPersonalCenter.vue
View file @ 4e7c1839
...@@ -50,6 +50,10 @@ ...@@ -50,6 +50,10 @@
<i class="iconfont icon-huiyuanicon"></i> <i class="iconfont icon-huiyuanicon"></i>
<span slot="title">会员中心</span> <span slot="title">会员中心</span>
</el-menu-item> </el-menu-item>
<el-menu-item index="9" @click="clickMenu('9')">
<i class="iconfont icon-huiyuanicon"></i>
<span slot="title">定制游</span>
</el-menu-item>
<el-submenu index="8"> <el-submenu index="8">
<template slot="title"> <template slot="title">
<i class="iconfont icon-dingdanicon"></i> <i class="iconfont icon-dingdanicon"></i>
......
src/plugins/index.js
View file @ 4e7c1839
...@@ -18,7 +18,7 @@ export default { ...@@ -18,7 +18,7 @@ export default {
// let domainUrl = "https://reborn.oytour.com"; //刘东主域名 // let domainUrl = "https://reborn.oytour.com"; //刘东主域名
let domainUrl = "https://reborn.oytour.com"; let domainUrl = "https://reborn.oytour.com";
// var domainUrl = "http://test.viitto.com" // var domainUrl = "http://test.viitto.com"
domainUrl = "http://192.168.2.214:9000" domainUrl = "http://192.168.2.214:8082"
let locationName = window.location.hostname; let locationName = window.location.hostname;
if (this.isOnline()) { if (this.isOnline()) {
if (window.location.host.indexOf('viitto.com') != -1) if (window.location.host.indexOf('viitto.com') != -1)
...@@ -31,7 +31,7 @@ export default { ...@@ -31,7 +31,7 @@ export default {
DomainUrl: domainUrl, DomainUrl: domainUrl,
//常用提交数据URL //常用提交数据URL
PostUrl: domainUrl + "/api/common/post", PostUrl: domainUrl + "/api/common/post",
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000", javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.106:9000",
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130', ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120", UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi", LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
...@@ -194,8 +194,7 @@ export default { ...@@ -194,8 +194,7 @@ export default {
'Referer-Viitto': this.$route.path 'Referer-Viitto': this.$route.path
} }
}) })
.then(res => { .then(res => {
// console.log(res,'123')
if (res.data.resultCode == 10000 || res.data.resultCode == 10001) { if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
this.$router.push({ this.$router.push({
path: '/login' path: '/login'
...@@ -216,8 +215,8 @@ export default { ...@@ -216,8 +215,8 @@ export default {
this.apiurl = apiurl; this.apiurl = apiurl;
var token = ""; var token = "";
var key = ""; var key = "";
let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : '' // let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : ''
let uid = userInfo.accountId ? userInfo.accountId : 0 // let uid = userInfo.accountId ? userInfo.accountId : 0
if (this.getLocalStorage() != null) { if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token; token = this.getLocalStorage().token;
key = this.getLocalStorage().SecretKey; key = this.getLocalStorage().SecretKey;
...@@ -228,8 +227,7 @@ export default { ...@@ -228,8 +227,7 @@ export default {
"msg": msg, "msg": msg,
"timestamp": timestamp, "timestamp": timestamp,
"token": token, "token": token,
"sign": md5Str, "sign": md5Str
"uid": uid
} }
if (localStorage.g && localStorage.g != 'undefined') { if (localStorage.g && localStorage.g != 'undefined') {
postData.groupId = parseInt(JSON.parse(localStorage.g).i) postData.groupId = parseInt(JSON.parse(localStorage.g).i)
......
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