Merge branch 'feature/order_edit' into release

# Conflicts:
#	src/pages/create_order/components/drawee.vue
#	src/pages/create_order/create_order.vue

src/pages/create_order/components/drawee.vue

@@ -77,9 +77,9 @@ export default {
           </label>
         </radio-group>
       </view>
-      <view class="flex action" v-if="!readonly">
-        <button @click="close">{{$lang.lang.create.cancel}}</button>
-        <button @click="submit" type="primary">{{$lang.lang.create.submit}}</button>
+      <view class="flex action">
+        <button @click="close">{{readonly ? $lang.lang.order.confirm : $lang.lang.create.cancel}}</button>
+        <button @click="submit" type="primary" v-if="!readonly">{{$lang.lang.create.submit}}</button>
       </view>
     </view>
   </uni-popup>

src/pages/create_order/create_order.vue

@@ -2033,6 +2033,8 @@
             if(harvestIndex > -1){
               this.currentHarvestIndex = harvestIndex
             }
+
+            this.hasConsignee = res.data.hasConsignee
           }
 				})
 			},
@@ -2093,7 +2095,8 @@
 			},
 			async updateOrder(){
         await this.validateCountryAndAreaCode()
-				this.$request.put('/app-api/my/order/update',this.params).then(res => {
+        this.params.hasConsignee = this.hasConsignee
+				this.$request.put('/app-api/my/order/update', this.params).then(res => {
 					this.isClick = false
 					if(res.code == 0){
 						this.params = {