增加发货页面的城市选择框

ghsApp/src/components/app-address-group.vue

@@ -3,7 +3,7 @@
 		<tui-list-cell
 			class="line-cell"
 			:hover="false"
-			:arrow="false"
+			:arrow="flag"
 			@click="openAddres"
 		>
 			<view class="tui-title ">{{ cityTitle }}</view>
@@ -94,7 +94,8 @@ export default {
 				longitude: "",
 				latitude: ""
 			},
-			showRegion: false
+			showRegion: false,
+      flag: false
 		};
 	},
 	mounted(){
@@ -102,14 +103,19 @@ export default {
 	},
 	methods: {
 		initAdress(){
-			return getUserDet({ id: this.customId }).then(res => {
-				this.form.province = res.data.province;
-				this.form.city = res.data.city;
-				this.form.address = res.data.address;
-				this.form.latitude = res.data.lat;
-				this.form.longitude = res.data.long;
-				this.$emit("selectAdress", this.form);
-			})
+      if(this.customId != '0') {
+        return getUserDet({ id: this.customId }).then(res => {
+          this.form.province = res.data.province;
+          this.form.city = res.data.city;
+          this.form.address = res.data.address;
+          this.form.latitude = res.data.lat;
+          this.form.longitude = res.data.long;
+          this.$emit("selectAdress", this.form);
+        })
+      } else {
+        this.flag = true
+      }
+			
 		},
 		formatForm() {
 			Object.keys(this.form).forEach(i => {
@@ -130,8 +136,9 @@ export default {
 		},
 		// 省市联动
 		openAddres() {
-			return;
-			this.$refs.simpleAddress.open();
+      if(this.flag) {
+        this.$refs.simpleAddress.open();
+      }
 		},
 		changeAreaFn(e) {
 			this.form.address = e.title;

ghsApp/src/pagesOrder/shipInfo.vue

@@ -15,40 +15,40 @@
 
 		</view>
 		<!-- 选择客户 -->
-		<AppCustomerSel :show.sync="showCustomer" @change="changeCustomerFn" />
+		<!-- <AppCustomerSel :show.sync="showCustomer" @change="changeCustomerFn" /> -->
 	</view>
 </template>
 
 <script>
 import TuiListCell from "@/components/plugin/list-cell";
-import AppAvatarModule from "@/components/module/app-avatar";
-import SimpleAddress from "@/components/plugin/simple-address";
-import AppAreaSel from "@/components/app-area-sel";
-import AppCustomerSel from "@/components/app-customer-sel";
-import productMins from "@/mixins/product";
-import appFormRadioBtn from "@/components/app-formRadio-btn";
-import appAddressGroup from "@/components/app-address-group";
-import appSendTime from "@/components/app-send-time";
+// import AppAvatarModule from "@/components/module/app-avatar";
+// import SimpleAddress from "@/components/plugin/simple-address";
+// import AppAreaSel from "@/components/app-area-sel";
+// import AppCustomerSel from "@/components/app-customer-sel";
+// import productMins from "@/mixins/product";
+// import appFormRadioBtn from "@/components/app-formRadio-btn";
+// import appAddressGroup from "@/components/app-address-group";
+// import appSendTime from "@/components/app-send-time";
 import appFormSend from "@/components/app-form-send1";
 const formUtil = require("@/utils/formValidation.js");
 import { sendExpressage } from "@/api/order/index";
-import { getUserDet } from "@/api/member/index";
+// import { getUserDet } from "@/api/member/index";
 import { mapActions, mapGetters } from "vuex";
 
 export default {
 	name: "BillingAffirm", // 开单确认
 	components: {
 		TuiListCell,
-		AppAvatarModule,
-		SimpleAddress,
-		AppAreaSel,
-		AppCustomerSel,
-		appFormRadioBtn,
-		appAddressGroup,
-		appSendTime,
+		// AppAvatarModule,
+		// SimpleAddress,
+		// AppAreaSel,
+		// AppCustomerSel,
+		// appFormRadioBtn,
+		// appAddressGroup,
+		// appSendTime,
 		appFormSend
 	},
-	mixins: [productMins],
+	// mixins: [productMins],
 	data() {
 		return {
 			customId:'',
@@ -80,7 +80,7 @@ export default {
 	onLoad(e) {
 		this.customId = e.id;
 		this.orderId = e.orderId;
-		if (!this.getMerchantInfo) {
+		if (!this.getMerchantInfo && this.customId != '0') {
 			this.initMerchantInfo().then(data => {
 				uni.setNavigationBarTitle({
 					title: data.name