Browse Source

feat: 1.‘我的’页面去掉部分功能 2.我的订单-业务系统下单的隐藏价格

xuqiaoying 3 years ago
parent
commit
cd9861fad9
2 changed files with 17 additions and 12 deletions
  1. 10 10
      pages/wd/index.vue
  2. 7 2
      pages2/order/index.vue

+ 10 - 10
pages/wd/index.vue

@@ -28,7 +28,7 @@
 						个学习任务
 					</view>
 				</navigator> -->
-				<view class="two_menu">
+				<!-- <view class="two_menu">
 					<navigator  hover-class="none" url="/pages2/wd/class" class="small_menu">
 						<image src="/static/icon/my_icon3.png" class="my_icon"></image>
 						<view>我的网课</view>
@@ -37,8 +37,8 @@
 						<image src="/static/icon/my_icon4.png" class="my_icon"></image>
 						<view>我的题库通</view>
 					</view>
-				</view>
-				<navigator  hover-class="none" url="/pages5/liveDetail/list" class="menu_box" >
+				</view> -->
+				<!-- <navigator  hover-class="none" url="/pages5/liveDetail/list" class="menu_box" >
 					<view class="box_left">
 						<image src="/static/icon/my_icon12.png" class="my_icon"></image>
 						<view>我的直播课</view>
@@ -48,8 +48,8 @@
 						<text>{{ total2 }}</text>
 						个课程直播中
 					</view>
-				</navigator>
-				<navigator  hover-class="none" url="/pages2/learn/my_learn" class="menu_box" >
+				</navigator> -->
+				<!-- <navigator  hover-class="none" url="/pages2/learn/my_learn" class="menu_box" >
 					<view class="box_left">
 						<image src="/static/icon/my_icon2.png" class="my_icon"></image>
 						<view>我的学时</view>
@@ -59,8 +59,8 @@
 						<text>{{ userNums.periodSum }}</text>
 						学时未通过
 					</view>
-				</navigator>
-				<navigator  hover-class="none" url="/pages5/exam/index" class="menu_box" >
+				</navigator> -->
+				<!-- <navigator  hover-class="none" url="/pages5/exam/index" class="menu_box" >
 					<view class="box_left">
 						<image src="/static/icon/my_icon11.png" class="my_icon"></image>
 						<view>我的模考</view>
@@ -69,8 +69,8 @@
 						<text>{{ total1 }}</text>
 						个模考预约
 					</view>
-				</navigator>
-				<navigator  hover-class="none" url="/pages2/exam/index" class="menu_box" >
+				</navigator> -->
+				<!-- <navigator  hover-class="none" url="/pages2/exam/index" class="menu_box" >
 					<view class="box_left">
 						<image src="/static/icon/my_icon10.png" class="my_icon"></image>
 						<view>我的考试</view>
@@ -79,7 +79,7 @@
 						<text>{{ userNums.subscribeSum }}</text>
 						考试预约
 					</view>
-				</navigator>
+				</navigator> -->
 				<navigator  hover-class="none" v-if="!hideBuyState" url="/pages2/order/index" class="menu_box">
 					<view class="box_left">
 						<image src="/static/icon/my_icon7.png" class="my_icon"></image>

+ 7 - 2
pages2/order/index.vue

@@ -57,8 +57,12 @@
 						<view class="footer" v-else>
 							<view>
 								<text style="color:#999;font-size: 24rpx;margin-right: 8rpx;">共{{ item.orderGoodsList.length }}项</text>
-								<text style="color: #333;font-size: 30rpx;font-weight: bold;">合计</text>
-								<text style="color:#ff2d55;font-size: 30rpx;font-weight: bold;">¥{{ item.payPrice }}</text>
+                                <!-- 业务系统下单的需要隐藏价格 -->
+                                <!-- 订单来源:1业务员普通单,2祥粤云学堂小程序,3祥粤云学堂网站,4祥粤e管证小程序,5业务员录单,6业务系统下单 -->
+                                <text v-if="item.orderFrom !== 6">
+                                    <text style="color: #333;font-size: 30rpx;font-weight: bold;">合计</text>
+								    <text style="color:#ff2d55;font-size: 30rpx;font-weight: bold;">¥{{ item.payPrice }}</text>
+                                </text>
 							</view>
 							<view style="display: flex;align-items: center;">
 								<view class="btn2" v-if="item.orderStatus === 0&&(item.orderFrom === 2 || item.orderFrom === 3)" @click="resumeOrder(item)">继续支付</view>
@@ -415,6 +419,7 @@ export default {
 				return;
 			}
 			this.current = index;
+            console.log('this.current', this.current)
 			if(this.current == 3) { //退款订单
 			this.formData.status = '';
 				this.orderRefundList()