Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user

pages/my/historyMy.vue

@@ -39,9 +39,13 @@
 							<view class="item-view-bottom-qian">
 								<span>￥</span>
 								<span>{{item.price}}</span>
-								<span>/套</span>
+								<span v-if="item.typeName!='项目'">/{{item.typeName=='次卡'?'次':item.typeName=='疗程'?'次':item.typeName=='套餐'?'套':'套'}}</span>
+								<span v-else></span>
 								<span>￥</span>
-								<span>{{item.oldPrice}}</span>
+								<span>
+									{{item.oldPrice}}
+									<span v-if="item.typeName!='项目'" style="color: #848484;">/{{item.typeName=='次卡'?'次':item.typeName=='疗程'?'次':item.typeName=='套餐'?'套':'套'}}</span>
+								</span>
 							</view>
 							<view class="item-view-bottom-btn">
 								查看

pages/order/index.vue

@@ -144,11 +144,23 @@
 						</u-button>
 						
 						<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
-							<u-button :custom-style="customStyle1" shape="circle" :plain="true"
+							<view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn">
+								联系客服
+							</view>
+							<view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn">
+								服务升级
+							</view>
+							<view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn">
+								去投诉
+							</view>
+							<view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn">
+								提前结束
+							</view>
+							<!-- <u-button :custom-style="customStyle1" shape="circle" :plain="true"
 								@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
 								联系客服
-							</u-button>
-							<u-button v-if="item.oldOrdersId==null && item.addNum==null" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
+							</u-button> -->
+							<!-- <u-button v-if="item.oldOrdersId==null && item.addNum==null" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
 									@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)">
 								服务升级
 							</u-button>
@@ -158,7 +170,7 @@
 							<u-button :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
 								@click="toggle('center',item)">
 								提前结束
-							</u-button>
+							</u-button> -->
 						</view>
 					</view>
 					<view class="showBtn" v-if="item.status ==7">
@@ -484,7 +496,7 @@
 			//获取列表数据
 			getOrderList() {
 				let curTab = this.tabs[this.tabIndex].status
-			
+				this.gengBtnShow=false;
 				let data = {
 					status: curTab,
 					page: this.page,
@@ -792,6 +804,19 @@
 </script>
 
 <style lang="scss" scoped>
+	.gengduoBtn{
+		background: #fff;
+		color: #019C88;
+		width: 69px;
+		height: 30px;
+		line-height: 30px;
+		border-radius: 40px;
+		font-size: 12px;
+		overflow: visible;
+		text-align: center;
+		border: 1px solid;
+		margin-top: 5px;
+	}
 	.content{
 		padding-bottom: 100px;
 	}