Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

src/pages/mine/address/addSite.vue

@@ -59,7 +59,6 @@
  * @property {String} type 编辑类型（默认为修改，add--新增、edit--修改、select--选择）
  * @property {String} info 地址信息（json字符串：包含地址信息）
  */
-import Utils from '@/utils/callUtils.js'
 let r = require('libs/bmap-wx.min.js');
 let h = new r.BMapWX({
 	ak: process.uniEnv.bmapAK,
@@ -270,7 +269,7 @@ export default {
 				address: address,
 				region: this.region
 			}
-			Utils.$emit("update-site", site)
+			prevPage.$vm.updateSite(site)
 			this.$u.route({ type: 'back' });
 		}
 	}

src/pages/parts/application.vue

@@ -51,7 +51,6 @@
 </template>
 
 <script>
-import Utils from '@/utils/callUtils.js'
 import SelectParts from '@/components/select-parts/adjust.vue'
 export default {
 	components: {
@@ -96,11 +95,6 @@ export default {
 		this.orderId = e && Number(e.orderId) || 0
 		this.initData()
 	},
-	mounted() {
-	    Utils.$on('update-site',(site)=>{
-	        this.updateSite(site);
-	    })
-	},
 	methods: {
 		initData() {
 			this.loadMineAddress()
@@ -144,10 +138,11 @@ export default {
 					this.order.contactCityText,
 					this.order.contactCommunityText,
 				]
+				let address = region.join("") + (this.order.contactStreetText || '') + this.order.contactAddress
 				this.customer = {
 					name: this.order.contactName,
 					mobile: this.order.contactPhone,
-					address: region.join("") + this.order.contactStreetText + this.order.contactAddress,
+					address: address,
 					region: region,
 					code: [
 						this.order.contactProvince,
@@ -192,7 +187,11 @@ export default {
 			})
 		},
 		updateSite(site) {
-			console.log("updateSite", site)
+			if(this.curType) {
+				this.customer = site
+			} else {
+				this.mine = site
+			}
 		},
 		addParts() {
 			this.$u.route({