Browse Source

解决冲突

Qukatie 2 days ago
parent
commit
2bf57313e5
1 changed files with 5 additions and 5 deletions
  1. 5 5
      pages/me/myInfo.vue

+ 5 - 5
pages/me/myInfo.vue

@@ -26,7 +26,7 @@
 					<u-picker :show="salesmanShow" :columns="salesmanList" keyName="name" @confirm="salesmanConfirm"
 						@cancel="salesmanShow=false" @close="salesmanShow=false" closeOnClickOverlay></u-picker>
 				</uni-forms-item>
-				<!-- <uni-forms-item name="deliveryWarehouseName" label="发货仓库" required>
+<!--				<uni-forms-item name="deliveryWarehouseName" label="发货仓库" required>
 					<view style="display: flex;align-items: center;height: 36px;">
 						<view @click="getStorageList();deliveryWarehouseShow=true"
 							style="width: 100%;text-align: right;"
@@ -39,10 +39,10 @@
 					<u-picker :show="deliveryWarehouseShow" :columns="deliveryWarehouseList" keyName="cname"
 						@confirm="deliveryWarehouseConfirm" @cancel="deliveryWarehouseShow=false"
 						@close="deliveryWarehouseShow=false" closeOnClickOverlay></u-picker>
-				</uni-forms-item> -->
+				</uni-forms-item>-->
 			</uni-forms>
 		</uni-section>
-		<!-- <uni-section title="店面分类" style="padding: 0 62rpx;margin-top: 30rpx;" titleColor="5F5F5F" titleFontSize="28rpx">
+<!--		<uni-section title="店面分类" style="padding: 0 62rpx;margin-top: 30rpx;" titleColor="5F5F5F" titleFontSize="28rpx">
 			<uni-forms ref="form2" :modelValue="form" :border="true" label-width="80">
 				<uni-forms-item name="corpsTypeName" label="店面分类" required>
 					<view style="display: flex;align-items: center;height: 36px;">
@@ -91,7 +91,7 @@
 					</view>
 				</uni-forms-item>
 			</uni-forms>
-		</uni-section> -->
+		</uni-section>-->
 		<view style="padding:30rpx 20rpx;">
 			<debounce-button bgColor="#03803B" @click="submit">修改</debounce-button>
 		</view>
@@ -141,7 +141,7 @@
 			this.getSelectType()
 			this.getLabel()
 			this.getSalerList()
-			this.getStorageList()
+			// this.getStorageList()
 			this.getAppDetails()
 		},
 		methods: {