Merge branch 'feature/order_edit' into release

# Conflicts:
#	src/pages/create_order/create_order.vue
#	src/static/lang/zh/create.js

src/pages/create_order/create_order.vue

@@ -1479,6 +1479,14 @@
           if(router){
             this.currentDstCountryIndex = this.dstCountryList.findIndex(item => item.id == router.objectiveId)
             this.currentDstCityIndex = this.filteredDstCityList.findIndex(item => item.id == router.objectiveId)
+            this.$set(this.params, 'objectiveId', router.destCityId)
+
+            // 找出始发城市
+            const startCityIdIndex = this.config.tradeCity1.value.findIndex(item => item == router.startCityId)
+            if(startCityIdIndex > -1){
+              this.config.tradeCity1.index = startCityIdIndex
+              this.$set(this.params, 'departureId', router.startCityId)
+            }
           }
         }
 				if(e.target.dataset.key == 'lineId'&&that.params.isCargoControl){
@@ -1791,7 +1799,25 @@
         }
         this.isClick = false
 			},
-			creatOrder(){
+			async creatOrder(){
+        if(this.hasConsignee){
+          const res = await this.$request.post('/app-api/ecw/region/check/dest-currency/area-code/', {
+            areaCode: this.params.congineeAreaCode,
+            currencyId: this.dstCountryList[this.currentDstCountryIndex].guojia
+          })
+          console.log("目的地货币校验", res)
+          if(!res.data){
+            const res = await uni.showModal({
+              title: this.$lang.lang.create.tips,
+              content: this.$lang.lang.create.areaCodeAndDestCountryCheckFail,
+              showCancel: true
+            })
+            console.log("确认结果", res)
+            if(!res[1].confirm){
+              return
+            }
+          }
+        }
 				this.$request.post('/app-api/my/order/create', {...this.params, hasConsignee: this.hasConsignee}).then(res => {
 					this.isClick = false
 					if(res.code == 0&&res.data){

src/static/lang/zh/create.js

@@ -121,4 +121,6 @@ export default {
   "billLadingPrice": "提单是否显示价格",
   "displayBillLadingPrice": "显示",
   "hideBillLadingPrice": "不显示",
+  "tips": "提示",
+  "areaCodeAndDestCountryCheckFail": "电话所在国与目的国不一致，请检查",
 }