Merge branch 'master' of http://47.99.244.21:9999/qinjianhui/factory_front into wq

src/views/order/index.vue

@@ -499,7 +499,7 @@
                     >
                     >
                       <span class="label">收货地址:</span>
                       <span class="label">收货地址:</span>
                       <span class="value" :title="scope.row.lanshouAddress">{{
                       <span class="value" :title="scope.row.lanshouAddress">{{
-                        scope.row.lanshouAddress
+                        scope.row.lanshouRegion + scope.row.lanshouAddress
                       }}</span>
                       }}</span>
                     </div>
                     </div>
                     <div
                     <div