任务88：客户端改造，首页和订单页面非86用户不显示我要下单按钮和菜单，不显示去处理和退仓按钮。显示提单号

src/pages/index/index.vue

@@ -29,6 +29,7 @@
         v-for="(item, index) in nvs"
         @click="toPage(item.url, item.isHttp)"
         :key="index"
+        v-if="(item.name === $lang.lang.index.delivery && isDelivery) || item.name !== $lang.lang.index.delivery"
       >
         <image :src="item.icon" mode=""></image>
         <view v-if="item.num > 0" class="order_dian">{{ item.num }}</view>
@@ -117,9 +118,14 @@
             @click="toOrderInfo(item.orderId)"
           >
             <view class="item-til">
-              <image src="../../static/img/sn.png" mode=""></image>
-              <view class="orderNo">{{ $lang.lang.index.orderNo }}:{{ item.orderNo }}</view>
-              <view class="marks">{{ $lang.lang.index.marks }}:{{ item.marks }}</view>
+              <view class="full-width">
+                <image src="../../static/img/sn.png" mode=""></image>
+                <view class="orderNo">{{ $lang.lang.index.orderNo }}:{{ item.orderNo }}</view>
+                <view class="marks">{{ $lang.lang.index.marks }}:{{ item.marks }}</view>
+              </view>
+              <view class="tidan-no" v-if="item.tidanNo">
+                <view class="tidanNo">{{ $lang.lang.index.tidanNo }}:{{ item.tidanNo }}</view>
+              </view>
             </view>
             <view class="item-body">
               <view class="item-body-v">{{ item.departureName }}</view>
@@ -265,6 +271,7 @@ export default {
       adData: {},
       updateAdData: {},
       membershipLevels:[],
+      isDelivery: true,
       levelLeviteInfo:'',
       levelTitle:'',
       noticeData: [],
@@ -429,7 +436,9 @@ export default {
       let that = this
       that.$request.get('/app-api/member/user/get').then((res) => {
         let userInfo = res.data
-        console.log(res.data)
+        if (userInfo != null){
+          this.isDelivery = userInfo.areaCode === '86';
+        }
         if (res.code == 0 && res.data) {
           if (res.data.isSimplePassword) {
             uni.showModal({

src/pages/order/order.vue

@@ -57,8 +57,13 @@
 					<image v-else class="fa" :src="receivingImg" mode=""></image>
 					<view class="order-list-it-v">
 						<view class="fa-v">
-							<text>{{$lang.lang.order.orderNo}}:{{item.orderNo}}</text>
-							<text>{{formatMsg(item.status)}}</text>
+              <view class="order-no">
+                <text>{{$lang.lang.order.orderNo}}:{{item.orderNo}}</text>
+                <text>{{formatMsg(item.status)}}</text>
+              </view>
+              <view v-if="item.tidanNo">
+                <text>{{ $lang.lang.index.tidanNo }}:{{ item.tidanNo }}</text>
+              </view>
 							<!-- <text>{{getStatusName(item.status)}}</text> -->
 						</view>
 					</view>
@@ -99,8 +104,8 @@
 							<view v-if='item.status==0||item.status==2' @click="toEditOrder(item.orderId, false)">{{$lang.lang.order.edit}}</view>
 							<view v-if='item.status==0||item.status==88' @click="delOrder(item.orderId)">{{$lang.lang.order.delete}}</view>
 							<view v-if='item.status==2&&item.status!=88' @click="cancelOrder(item.orderId)">{{$lang.lang.order.cancelOrder}}</view>
-							<view v-if='item.status==5&&item.status!=88' @click="returnOrder(index)">{{$lang.lang.order.exit}}</view>
-							<view v-if='item.abnormalState!=0&&item.status!=88' @click="toException(item.orderId)">{{$lang.lang.order.toDeal}}</view>
+							<view v-if='item.status==5&&item.status!=88&&isDelivery' @click="returnOrder(index)">{{$lang.lang.order.exit}}</view>
+							<view v-if='item.abnormalState!=0&&item.status!=88&&isDelivery' @click="toException(item.orderId)">{{$lang.lang.order.toDeal}}</view>
 						</view>
 						<view  class="order-btn">
 							<view  @click="copy(item.orderId)">{{$lang.lang.order.copy}}</view>
@@ -113,7 +118,7 @@
 			</view>
 		</view>
 
-		<view class="bom">
+		<view class="bom" v-if="isDelivery">
 			<view class="" @click="toCreatOrders">
 				<image src="../../static/img/carFa.png" mode=""></image>
 				<text>{{$lang.lang.order.delivery}}</text>
@@ -501,6 +506,7 @@
 				reason:'',
 				imgUrl:[],//退仓图片地址
 				params:{},
+        isDelivery: true,
 				config:{
 					transport:{
 						index:-1,
@@ -638,6 +644,9 @@
 					if(res.code==0&&res.data){
 						this.userInfo = res.data
 						this.isHavePassword = this.userInfo.isHavePassword
+            if (this.userInfo != null){
+              this.isDelivery = this.userInfo.areaCode === '86';
+            }
 					}
 
 				})

src/static/css/index.css

@@ -183,24 +183,25 @@ page{
 	margin: 0 auto;
 	padding: 20upx;
 	display: flex;
+	flex-direction: column;
 	color: var(--c3);
 	font-size: var(--f26);
 	border-bottom: 1px solid #DFDFDF;
 	align-items: center;
 	position: relative;
 }
-.act-list .item-til image{
+.act-list .item-til .full-width image{
 	width: 42upx;
 	height: 40upx;
 	margin: 6upx 10upx 0 0;
 }
-.act-list .item-til .marks{
+.act-list .item-til .full-width .marks{
 	position: absolute;
 	right: 20upx;
 	font-size: var(--f26);
 	color: var(--c3);
 }
-.act-list .item-til .orderNo{
+.act-list .item-til .full-width .orderNo{
 	width: 320upx;
 }
 .item-body{
@@ -573,4 +574,19 @@ page{
 	position: absolute;
 	right: 6px;
 	margin: 0;
+}
+.full-width{
+	width: 100%;
+	display: flex;
+	color: var(--c3);
+	font-size: var(--f26);
+	align-items: center;
+	position: relative;
+	float: right;
+}
+.tidan-no{
+	width: 100%;
+}
+.tidanNo{
+	margin-left: 54upx;
 }
\ No newline at end of file

src/static/css/order.css

@@ -143,13 +143,13 @@
 .order-list-it-v{
 	width: 84%;
 }
-.order-list-tp .fa-v{
+.order-list-tp .fa-v .order-no{
 	padding: 0upx 0 10upx;
 	border-bottom: 1px solid var(--cdf);
 	display: flex;
 	justify-content: space-between;
 }
-.fa-v text{
+.fa-v .order-no text{
 	font-size: 28rpx;
 }
 .order-list-user{

src/static/lang/en/index.js

@@ -4,6 +4,7 @@ export default {
   "notice": "Notice",
   "dynamic": "Trend",
   "orderNo": "Order No.",
+  "tidanNo": "PL No.",
   "marks": "Mark",
   "help": "Help",
   "consult": "Inquiry",

src/static/lang/fr/index.js

@@ -4,6 +4,7 @@ export default {
   "notice": "Avis",
   "dynamic": "Tendances",
   "orderNo": "Numéro de commande",
+  "tidanNo": "Numéro de PL",
   "marks": "Marquer",
   "help": "Aide",
   "consult": "Demande",

src/static/lang/zh/index.js

@@ -4,6 +4,7 @@ export default {
   "notice": "公告",
   "dynamic": "动态",
   "orderNo": "订单号",
+  "tidanNo": "提单号",
   "marks": "唛头",
   "help": "帮助",
   "consult": "咨询",