Merge branch 'release' into 'jd_dev'

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

See merge request !37

src/pages/create_order/create_order.vue

@@ -146,7 +146,8 @@
         <!--目的城市-->
 				<view class="corder-tab1-item corder-picker">
 					<image src="../../static/img/corder-1-4.png" mode=""></image>
-					<text><span class="redcolor">*</span>{{$lang.lang.create.endCity}}</text>
+          <!--2024-11-21 要求改非必填 https://devops.aliyun.com/projex/bug/JDAA-127# 《3	APP城市非必填》-->
+					<text><!--<span class="redcolor">*</span>-->{{$lang.lang.create.endCity}}</text>
           <picker class="v-picker" :range="filteredDstCityList" :range-key="shiRangeKey" :value="currentDstCityIndex" @change="changeDstCity">
             <view class="uni-input">{{ currentDstCityIndex !== null ? filteredDstCityList[currentDstCityIndex][shiRangeKey] : $lang.lang.create.choose }}</view>
           </picker>
@@ -1987,23 +1988,14 @@
 							that.getConfigIndex('provinceList',that.params.consigneeVO.city)
 						}
 						that.getConIndex()
-						if(that.params.consigneeVO&&that.params.consigneeVO.deliveryDate){
-							that.params.deliveryDate = that.params.consigneeVO.deliveryDate
-							var dateArr = that.params.consigneeVO.deliveryDate.split(' ')
+            // 2024-11-21测试consigneeVO下面的deliveryDate为null，而且可能没有收货人所有不能据此回显
+						if(that.params.deliveryDate){
+							var dateArr = that.params.deliveryDate.split(' ')
 							that.date = dateArr[0]
 							that.time = dateArr[1]
 						}
 						that.getOffData()
 
-            // // 没有收货人信息
-            // if(!that.params.consigneeVO){
-            //   that.hasConsignee = false
-            // }
-            // 如果用户当前不支持无收货人，则强制显示收货人信息
-            // if(that.noConsignee){
-            //   that.hasConsignee = true
-            // }
-
             // 回显目的城市和目的国
             const dstCityIndex = this.filteredDstCityList.findIndex(item => item.shi === that.params.objectiveId)
             if(dstCityIndex > -1){
@@ -2038,7 +2030,10 @@
               this.currentHarvestIndex = harvestIndex
             }
 
-            // this.hasConsignee = res.data.hasConsignee
+            this.hasConsignee = res.data.hasConsignee
+            if (!that.noConsignee){
+              this.hasConsignee = true
+            }
           }
 				})
 			},
@@ -2690,7 +2685,7 @@
 			getCon(){
 				let that = this
 				that.$request.get('/app-api/ecw/admin-client/page',{page:that.page,rows:10,searchKey:that.searchKey}).then(res => {
-					if(res.code==0&&res.data&&res.data.list.length>0){
+					if(res.code==0){
 						if(that.page==1){
 							that.consignee = []
 							that.consignee = res.data.list

src/pages/order/order.vue

@@ -102,8 +102,8 @@
 							<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>
-						<view  class="order-btn" v-if="item.status!=88&&item.customsType==2">
-							<view  @click="openFile(item.orderId,item.orderNo)">{{$lang.lang.notices.upCustome}}</view>
+						<view  class="order-btn">
+							<view  @click="copy(item.orderId)">{{$lang.lang.order.copy}}</view>
 						</view>
 					</view>
 				</view>
@@ -1317,14 +1317,19 @@
 			open(){
 				// this.$refs.declaration.open()
 			},
-			orderConfig () {
+			/*orderConfig () {
 				let that = this
 				that.$request.getConfig('transport_type').then(res => {
 					if(res.code==0&&res.data&&res.data.list.length > 0){
 						that.transType = res.data.list
 					}
 				})
-			},
+			},*/
+      copy(orderId){
+        this.$request.post("/app-api/my/order/copy/" + orderId).then(res => {
+          this.toEditOrder(res.data)
+        })
+      }
 		},
 
 	}

src/static/lang/zh/order.js

@@ -79,5 +79,6 @@ export default {
   "member": "会员",
   "manager": "管理员",
   "lendingType": "校验方式",
-  "lendSussess": "放货成功"
+  "lendSussess": "放货成功",
+  "copy": "复制"
 }