Merge branch 'release' into 'jd_dev'

Release最新代码合并入捷道研发分支20241115

See merge request !35

src/pages/create_order/components/drawee.vue

@@ -5,7 +5,7 @@ export default {
   props:{
     value:{
       type:Array,
-      default:[]
+      default: () => []
     },
     readonly:{
       type:Boolean,

src/pages/create_order/create_order.vue

@@ -14,7 +14,7 @@
 					<image src="../../static/img/corder-1.png" mode=""></image>
 					<view class="flex items-center flex-1">
             <view class="title">{{$lang.lang.create.consignee}}</view>
-            <radio-group @change="changeHasConsignee" class="flex items-center">
+            <radio-group @change="changeHasConsignee" class="flex items-center" v-if="noConsignee">
               <label class="radio">
                 <radio value="1" :checked="hasConsignee" /><text>有</text>
               </label>
@@ -23,12 +23,12 @@
               </label>
             </radio-group>
           </view>
-          <view class="flex items-center" style="width: 30px">
+          <view class="flex items-center" style="width: 30px" v-if="hasConsignee">
             <image src="../../static/img/add.png" class="icon" v-if="!showFullConsignee" @click="showFullConsignee=true"></image>
             <image src="../../static/img/sub.png" class="icon" v-else @click="showFullConsignee=false"></image>
           </view>
 				</view>
-				<view class="corder-tab1-item corder-picker">
+				<view class="corder-tab1-item corder-picker" v-if="hasConsignee">
 					<image src="../../static/img/order-user.png" mode=""></image>
 					<text><span class="redcolor">*</span>{{$lang.lang.create.name}}</text>
 					<view class="addname">
@@ -40,7 +40,7 @@
 						<view v-if="hasConsignee" class="choiceBtn" @click="tochoice">{{$lang.lang.create.choiceConsignee}}</view>
 					</view>
 				</view>
-				<view class="corder-tab1-item">
+				<view class="corder-tab1-item" v-if="hasConsignee">
 					<image src="../../static/img/order-tel.png" mode=""></image>
 					<text><span class="redcolor">*</span>{{$lang.lang.create.phone}}</text>
 					<!-- <input v-model="params.consigneePhone" type="text" :placeholder="请输入电话" /> -->
@@ -66,7 +66,7 @@
               :placeholder="$lang.lang.notices.phone" />
 					</view>
 				</view>
-        <template v-if="showFullConsignee">
+        <template v-if="showFullConsignee && hasConsignee">
           <!-- v1.7新增 -->
           <view class="corder-tab1-item corder-picker">
             <image src="../../static/img/order-user.png" mode=""></image>
@@ -175,12 +175,12 @@
           </picker>
           <image class="rgt" src="../../static/img/rgt.png" mode=""></image>
         </view>
-        <view class="corder-tab1-item corder-picker" v-if="lineMethod">
+        <view class="corder-tab1-item corder-picker" v-if="otherService.indexOf('1') > -1 || otherService.indexOf('4') > -1">
           <image src="../../static/img/corder-1-2.png" mode=""></image>
           <text>{{$lang.lang.create.type}}</text>
           <view class="order_type">
             <checkbox-group @change="changeType">
-              <view v-for="item in items" :key="item.value" v-if="item.show">
+              <view v-for="item in items" :key="item.value" v-if="otherService.indexOf(item.value) > -1">
                 <checkbox style="transform:scale(0.8)" :value="item.value" :checked="item.checked" />{{item.name}}
               </view>
             </checkbox-group>
@@ -1269,7 +1269,11 @@
       },
       harvestRangeKey(){
         return this.$lang.locale == 'zh' ? 'label' : 'labelEn'
-      }
+      },
+      otherService(){
+        const currentRoute = this.currentRouteIndex !== null ? this.routerList[this.currentRouteIndex] : null
+        return currentRoute?.otherService?.split(",") || []
+      },
 		},
 		watch:{
 			'params.countryCode'(){
@@ -1995,10 +1999,6 @@
             if(!that.params.consigneeVO){
               that.hasConsignee = false
             }
-            // 如果用户当前不支持无收货人，则强制显示收货人信息
-            if(!that.noConsignee){
-              that.hasConsignee = true
-            }
 
             // 回显目的城市和目的国
             const dstCityIndex = this.filteredDstCityList.findIndex(item => item.shi === that.params.objectiveId)
@@ -2035,6 +2035,10 @@
             }
 
             this.hasConsignee = res.data.hasConsignee
+            // 如果用户当前不支持无收货人，则强制显示收货人信息
+            if(!that.noConsignee){
+              that.hasConsignee = true
+            }
           }
 				})
 			},

src/pages/orderInfo/orderInfo.vue

@@ -180,7 +180,8 @@
 					</view>
 				</view>
         <view class="addicon" @click="basicShowMore=!basicShowMore">
-          <image src="/static/img/addicon.png"></image>
+          <image src="/static/img/add.png" v-if="!basicShowMore"></image>
+          <image src="/static/img/sub.png" v-else></image>
         </view>
         <view :class="basicShowMore?'showInfoClass':'hideInfoClass'" >
           <view class="order-info-line" >
@@ -263,7 +264,8 @@
           </view>
         </view>
         <view class="addicon" @click="shopShowMore=!shopShowMore">
-          <image src="/static/img/addicon.png"></image>
+          <image src="/static/img/add.png" v-if="!shopShowMore"></image>
+          <image src="/static/img/sub.png" v-else></image>
         </view>
         <view :class="shopShowMore?'showInfoClass':'hideInfoClass'" >
           <view class="order-info-line">