业务员端+客户端修改

page_goods/orderDetail/orderDetail.vue

@@ -9,6 +9,7 @@
 				<view class="status-name">
 					<view class="name">
             <text v-if="orderData.order_status_name == '待审核' && payInfo.pay_status == 0">待支付</text>
+            <text v-else-if="orderData.order_status_name == '待审核' && orderData.order_status == 1">待发货</text>
             <text v-else>{{ orderData.order_status_name }}</text>
 
 						<text v-if="orderData.promotion_status_name">（{{ orderData.promotion_status_name }}）</text>

page_salesman_index/index/beconfirmed.vue

@@ -166,7 +166,7 @@
 			btn(order, member) {
 				let _this = this
 				setTimeout(() => {
-					eventBus.$emit('urlone', 6)
+					eventBus.$emit('urlone', 5)
 				}, 500)
 
 				console.log(order, member);

page_salesman_index/index/bereceived.vue

@@ -171,7 +171,7 @@
 				// order  订单id  member 下单客户id
 				let _this = this
 				setTimeout(() => {
-					eventBus.$emit('urlone', 4)
+					eventBus.$emit('urlone', 3)
 				}, 500)
 				console.log(order, member);
 				uni.navigateTo({

page_salesman_index/index/close.vue

@@ -176,7 +176,7 @@
 				console.log(order, member);
 				let _this = this
 				setTimeout(() => {
-					eventBus.$emit('urlone', 5)
+					eventBus.$emit('urlone', 6)
 				}, 500)
 
 				uni.navigateTo({

page_salesman_index/index/index.vue

@@ -318,7 +318,7 @@
 						this.headimg = res.data.headimg
 						this.nickname = res.data.realname
 
-						if (!authList || authList.length <= 0) {
+						if (!authList || authList.length <= 0 || 1==1) {
 							//权限设置
 							this.box = true
 							this.$api.sendRequest({

page_salesman_index/index/received.vue

@@ -177,7 +177,7 @@
 				console.log(order, member);
 				let _this = this
 				setTimeout(() => {
-					eventBus.$emit('urlone', 5)
+					eventBus.$emit('urlone', 4)
 				}, 500)
 
 				uni.navigateTo({

page_salesman_index/index/reviewed.vue

@@ -197,7 +197,7 @@
 			btn(order, member) {
 				let _this = this
 				setTimeout(() => {
-					eventBus.$emit('urlone', 2)
+					eventBus.$emit('urlone', 1)
 				}, 500)
 
 				// order  订单id  member 下单客户id

page_salesman_index/index/shipped.vue

@@ -44,8 +44,8 @@
 					@click.stop="increased(item,item.order_id,item.member_id)">新增收款</div>
 				<div class="df aic jcsa listtwo" v-if="item.sales_balance==1 && item.sales_status==1"
 					@click.stop="affirm(item.order_id,item.member_id)">确认收款</div>
-        <!--订单处于待审核状态展示取消审核按钮-->
-        <div class="df aic jcsa listsui" v-if="item.sales_status != 0" @click.stop="cancelAudit(item.order_id,item.member_id)">取消审核</div>
+        <!--订单处于待审核状态展示取消审核按钮-暂时注释-->
+<!--        <div class="df aic jcsa listsui" v-if="item.sales_status != 0" @click.stop="cancelAudit(item.order_id,item.member_id)">取消审核</div>-->
 				<div class="df aic jcsa listsui" @click.stop="more(item)">再次订购</div>
 			</view>
 		</view>
@@ -182,7 +182,7 @@
 			btn(order, member) {
 				let _this = this
 				setTimeout(() => {
-					eventBus.$emit('urlone', 3)
+					eventBus.$emit('urlone', 2)
 				}, 500)
 				uni.navigateTo({
 					// url:this.list[this.current.URL]

page_salesman_order/Order_details/Order_details.vue

@@ -251,9 +251,10 @@
 						@click="ConfirmCharge">确认收货</div>
 					<div class="df aic jcsa listtwo" v-if="data.order_status_name=='待支付'" @click="payment">去支付</div>
 					<div class="df aic jcsa listtwo" v-if="data.order_status==1" @click="show3=true">确认发货</div>
-					<div class="df aic jcsa listtwo" v-if="data.sales_status == 0" @click="show9=true">去审核</div>
+<!--          暂时注释,只保留客户端的审核功能-->
+<!--<div class="df aic jcsa listtwo" v-if="data.sales_status == 0" @click="show9=true">去审核</div>-->
 <!--订单状态order_status在[0待支付,1待发货,20待审核] && sales_status=0时才展示取消审核-->
-					<div class="df aic jcsa listtwo" v-if="data.sales_status != 0 && [0,1,20].includes(data.order_status)" @click="cancelAudit(data.order_id)">取消审核</div>
+<!--					<div class="df aic jcsa listtwo" v-if="data.sales_status != 0 && [0,1,20].includes(data.order_status)" @click="cancelAudit(data.order_id)">取消审核</div>-->
 				</view>
 				<u-overlay :show="show9">
 					<view class="head-one">

page_salesman_order/index/index.vue

@@ -63,7 +63,7 @@
 			<received ref=six></received>
 		</view>
 
-		<!-- 待确认收款 -->
+		<!-- 待确认收款(待收款) -->
 		<view v-if="indexa==5">
 			<Collectionto ref=seven></Collectionto>
 		</view>
@@ -78,15 +78,15 @@
 
 <script>
 	import tabbar from "@/components/pageSalesman/tabbar/tabbar.vue"
-	import received from "@/page_salesman_index/index/received.vue"
-	import close from "@/page_salesman_index/index/close.vue"
+	import received from "@/page_salesman_index/index/received.vue"//详情-已收货
+	import close from "@/page_salesman_index/index/close.vue"//详情-已关闭
 	import deliveredsa from "@/page_salesman_index/index/delivered.vue"
 	import undgbm from "@/page_salesman_order/undgbm/undgbm.vue"
 	import dettisl from "@/page_salesman_order/Order_dettisl/Order_dettisl.vue"
-	import Tobeshipped from "@/page_salesman_index/index/shipped.vue"
-	import reviewed from "@/page_salesman_index/index/reviewed.vue"
-	import Collectionto from "@/page_salesman_index/index/beconfirmed.vue"
-	import Goodsto from "@/page_salesman_index/index/bereceived.vue"
+	import Tobeshipped from "@/page_salesman_index/index/shipped.vue"//详情-待发货
+	import reviewed from "@/page_salesman_index/index/reviewed.vue"//详情-待审核
+	import Collectionto from "@/page_salesman_index/index/beconfirmed.vue"//详情-待确认收款(待收款)
+	import Goodsto from "@/page_salesman_index/index/bereceived.vue"//详情-待收货
 	import selectPopup from "@/page_salesman_reportForm/index/selectPopup.vue"
 	export default {
 		components: {