twt il y a 3 ans
Parent
commit
3ce5b8a237

+ 66 - 24
operatingCompany/pages/intended/addIshop.vue

@@ -4,47 +4,50 @@
 		<view class="line">
 			<view class="lineLeft">招商经理</view>
 			<view class="lineRight">
-				<input type="text" v-model="userInfo.name" placeholder="" disabled class="lineInput"/>
+				<input type="text" v-model="userInfo.name" placeholder="" disabled class="lineInput" placeholder-style="color:#999999;"/>
 			</view>
 		</view>
 		<view class="line">
-			<view class="lineLeft">门店名称</view>
+			<view class="lineLeft" >门店名称</view>
 			<view class="lineRight">
-				<input type="text" v-model="value.shopName" placeholder="请输入" class="lineInput"/>
+				<!-- <input type="text" v-model="value.shopName" placeholder="请输入" class="lineInput"/> -->
+				<textarea type="text" :class="{iost:isios}" v-model="value.shopName" placeholder="请输入" class=" lineInput2" placeholder-style="color:#999999;line-height: normal;" style="line-height: normal;"/>
 			</view>
 		</view>
 		<view class="line">
 			<view class="lineLeft">门店地址</view>
 			<view class="lineRight ">
 				<picker @change="bindChange" mode="region" >
-					<view class="lineAddress ">{{shopaddress == null ? '请选择' :shopaddress}}
+					<view class="lineAddress ">
+						<span style="color: #999999;" v-if="shopaddress == null">请选择</span>
+						<span v-else>{{shopaddress}}</span>
 						<image class="downArrow" src="../../static/img/jiantou.png"></image>
 					</view>
 				</picker>
 			</view>
 		</view>
 		<view class="line">
-			<view class="lineLeft">详细地址</view>
+			<view class="lineLeft" >详细地址</view>
 			<view class="lineRight">
-				<input type="text" v-model="value.address" placeholder="请输入" class="lineInput"/>
+				<textarea type="text" :class="{iost:isios}" v-model="value.address" placeholder="请输入" class=" lineInput2" placeholder-style="color:#999999;line-height:40rpx;font-size:28rpx;" style="line-height: normal;"/>
 			</view>
 		</view>
 		<view class="line">
 			<view class="lineLeft">联系人</view>
 			<view class="lineRight">
-				<input type="text" v-model="value.contactor" placeholder="请输入" class="lineInput"/>
+				<input type="text" v-model="value.contactor" placeholder="请输入" class="lineInput" placeholder-style="color:#999999;"/>
 			</view>
 		</view>
 		<view class="line">
 			<view class="lineLeft">联系方式</view>
 			<view class="lineRight">
-				<input type="number" v-model="value.contactorPhone" placeholder="请输入" class="lineInput"/>
+				<input type="number" v-model="value.contactorPhone" placeholder="请输入" class="lineInput" placeholder-style="color:#999999;"/>
 			</view>
 		</view>
 		<view class="line">
 			<view class="lineLeft">工位数量</view>
 			<view class="lineRight">
-				<input type="number" v-model="value.stationNum" placeholder="请输入" class="lineInput"/>
+				<input type="number" v-model="value.stationNum" placeholder="请输入" class="lineInput" placeholder-style="color:#999999;"/>
 			</view>
 		</view>
 		
@@ -53,7 +56,7 @@
 			<view class="lineRight2">
 			  <view class="imgLine2" >
 				  <view class="imgLine" v-for="(img,imgindex) in imgArr" :class="{img4:(imgindex+1)%4==0}">
-				  	<image @click="previewImage(img,item.imgArr)"  :src="img" mode="" class="itemImg"></image>
+				  	<image @click="previewImage(img,imgArr)"  :src="img" mode="" class="itemImg"></image>
 				    <image src="../../static/img/icon_delpic@2x.png" mode=""  class="delImg" @click="delimg(item,imgindex)"></image>
 				     
 				  </view>
@@ -64,7 +67,8 @@
 		<view class="line">
 			<view class="lineLeft">备注</view>
 			<view class="lineRight">
-				<input type="text" v-model="value.description" placeholder="请输入" class="lineInput"/>
+				<textarea type="text" v-model="value.description" placeholder="请输入" class=" lineInput2" :class="{iost:isios}" placeholder-style="color:#999999;line-height:40rpx;font-size:28rpx;" style="line-height: normal;"/>
+				<!-- <input type="text" v-model="value.description" placeholder="请输入" class="lineInput" placeholder-style="color:#999999;"/> -->
 			</view>
 		</view>
 		<view style="height: 126rpx;"></view>
@@ -101,10 +105,18 @@
 				imgArr:[],
 				shopaddress:null,
 				id:'',
+				gonext:true,
+				isios:'',
 			}
 		},
 		
 		onLoad(opt) {
+			console.log(uni.getSystemInfoSync().platform)
+			 if(uni.getSystemInfoSync().platform === 'android'||uni.getSystemInfoSync().platform === 'devtools'){
+			        //this.isios=true
+			    }else{
+			       this.isios=true
+			    }
 			this.$common.isUserId()
 			this.userInfo = uni.getStorageSync("userInfo");
 			this.value.managerID=this.userInfo.id;
@@ -112,6 +124,9 @@
 			if(opt.id){
 				this.id=opt.id
 				this.getData()
+				uni.setNavigationBarTitle({
+					title:"编辑门店"
+				})
 			}
 		},
 		methods: {
@@ -123,6 +138,7 @@
 					res.data.imgsList.forEach(item=>{
 						this.imgArr.push(item.imgUrl)
 					})
+					this.shopaddress=this.value.provinceName+this.value.cityName+this.value.areaName
 					
 					
 				})
@@ -144,10 +160,14 @@
 				}else if(!this.value.contactorPhone){
 					uni.showToast({title: '请填写联系方式',icon:'none',duration: 2000,});
 					return false;
-				}else if(!this.value.stationNum){
-					uni.showToast({title: '请填写工位数量',icon:'none',duration: 2000,});
-					return false;
-				}else if(this.imgArr.length==0){
+				}else if(this.value.stationNum!==0){
+					if(!this.value.stationNum){
+						uni.showToast({title: '请填写工位数量',icon:'none',duration: 2000,});
+						return false;
+					}
+				
+				}
+				 if(this.imgArr.length==0){
 					uni.showToast({title: '请上传门头照片',icon:'none',duration: 2000,});
 					return false;
 				}
@@ -160,6 +180,10 @@
 				    return false; 
 				} 
 				this.value.imgs=this.imgArr.join(',')
+				if(!this.gonext){
+					return false;
+				}
+				this.gonext=false;
 				this.$http('accompany/superIntendedShop/addIntendedShop', 
 					this.value
 				, 'POST').then(res => {
@@ -170,11 +194,13 @@
 						    duration: 2000,
 						});
 						setTimeout(function(){
+							this.gonext=true;
 							uni.navigateBack({
 								delta:1
 							}) 
 						},1000)
 					}else{
+						this.gonext=true;
 						uni.showToast({ title: '操作失误',icon:'none',duration: 2000,});
 					}
 					
@@ -253,8 +279,12 @@
 				    }
 				});
 			},
-			previewImage(img,arr){
-				//var arr=[];
+			previewImage(img,imgArr){
+				
+				var arr=[];
+				imgArr.forEach(item=>{
+					arr.push(item)
+				})
 				//arr.push(img)
 				// 预览图片
 				uni.previewImage({
@@ -304,6 +334,14 @@
 		height: 48rpx;
         line-height: 48rpx;
 	}
+	.lineInput2{
+		width: 500rpx;
+		height: 90rpx;
+		padding-top: 10rpx;
+	}
+	.iost{
+		padding-top: 0rpx;
+	}
 	.downArrow{
 		width: 14rpx;
 		height: 26rpx;
@@ -324,8 +362,9 @@
 		border-bottom: 1px solid #EEEEEE;
 	}
 	.itemImg{
-		width:150rpx;
-		height: 150rpx;
+		width:160rpx;
+		height: 160rpx;
+		margin-top: 30rpx;
 		
 	}
 	
@@ -333,18 +372,19 @@
 		width: 32rpx;
 		height: 32rpx;
 		position: absolute;
-		right:-20rpx;
-		top: -20rpx;
+		right:-15rpx;
+		top: 15rpx;
 		z-index: 11;
+		
 	}
 	.imgLine{
 		position: relative;
-		width: 150rpx;
-		height: 150rpx;
-		background: #F4F5F7;
+		width: 160rpx;
+		
 		border-radius: 10rpx;
 		display: flex;
 		margin-right: 20rpx;
+		/* margin-top: 20rpx; */
 	}
 	.imgLine2{
 		padding-top: 20rpx;
@@ -362,6 +402,7 @@
 		position: fixed;
 		left: 0;
 		bottom: 0;
+		z-index: 11;
 	}
 	.bottomBtn{
 		width: 702rpx;
@@ -376,4 +417,5 @@
 		margin-left: 24rpx;
 		
 	}
+	
 </style>

+ 9 - 7
operatingCompany/pages/intended/shopManage.vue

@@ -83,6 +83,7 @@
 					areaCode: '',
 					area: '',
 					address: null,
+					shopName:'',
 				},
 				thirdIndex: 0,
 				thirdArr: [
@@ -117,7 +118,7 @@
 			
 			search(val) {
 				// console.log(val);
-				this.searchValue = val
+				this.data.shopName = val
 				this.page = 1
 				this.getShopData()
 			},
@@ -153,7 +154,7 @@
 				this.thirdIndex = e.target.value
 				this.status = this.thirdArr[this.thirdIndex].ID
 				if (e.target.value == 0) {
-					this.thirdIndex = 1
+					this.thirdIndex = 0
 				}
 				this.page = 1
 				this.getShopData()
@@ -172,7 +173,7 @@
 						city: this.data.cityCode,
 						area: this.data.areaCode,
 						shopState: this.status,
-
+                        shopName:this.data.shopName
 					}
 				this.$http(url, params, 'GET').then(res => {
 					var list = res.data.Items
@@ -320,7 +321,7 @@
 
 	.shopTop {
 		display: flex;
-		padding: 30rpx 20rpx 10rpx 20rpx;
+		padding: 30rpx 20rpx 0rpx 20rpx;
 		justify-content: space-between;
 
 	}
@@ -354,7 +355,7 @@
 		color: #999999;
 	}
 	.bottomView {
-		padding: 28rpx 20rpx;
+		padding: 20rpx 20rpx;
 		display: flex;
 		justify-content: space-between;
 	}
@@ -392,7 +393,8 @@
 		font-size: 28rpx;
 	}
 	.shopBoxright{
-		display: flex;
-		align-items: center;
+		/* display: flex;
+		align-items: center; */
+		padding-top: 30rpx;
 	}
 </style>

+ 13 - 10
operatingCompany/pages/intended/shopManageDetail.vue

@@ -10,21 +10,21 @@
 		<view class="line">
 			<view class="lineLeft">门店名称</view>
 			<view class="lineRight">
-				<input type="text" v-model="value.shopName" disabled placeholder="请输入" class="lineInput"/>
+				<view class="lineCOnt">{{value.shopName}}</view>
 			</view>
 		</view>
 		<view class="line">
 			<view class="lineLeft">门店地址</view>
 			<view class="lineRight ">
 				<view class="lineRight">
-					<input type="text" v-model="value.provinceName+value.cityName+value.areaName" disabled placeholder="请输入" class="lineInput"/>
+					<view class="lineCOnt">{{value.provinceName+value.cityName+value.areaName}}</view>
 				</view>
 			</view>
 		</view>
 		<view class="line">
 			<view class="lineLeft">详细地址</view>
 			<view class="lineRight">
-				<input type="text" v-model="value.address" placeholder="请输入" class="lineInput"/>
+				<view class="lineCOnt">{{value.address}}</view>
 			</view>
 		</view>
 		<view class="line">
@@ -60,7 +60,8 @@
 		<view class="line">
 			<view class="lineLeft">备注</view>
 			<view class="lineRight">
-				<input type="text" disabled v-model="value.description" placeholder="请输入" class="lineInput"/>
+				<view class="lineCOnt">{{value.description}}</view>
+				
 			</view>
 		</view>
 		<view style="height: 126rpx;"></view>
@@ -140,7 +141,7 @@
 				if(e.detail.value==0){
 					this.shopState=2
 				}else if(e.detail.value==1){
-					this.shopState=2
+					this.shopState=3
 				}
 				this.$http('accompany/superIntendedShop/updateShopState',
 					{
@@ -240,8 +241,9 @@
 		border-bottom: 1px solid #EEEEEE;
 	}
 	.itemImg{
-		width:150rpx;
-		height: 150rpx;
+		width:160rpx;
+		height: 160rpx;
+		margin-top: 20rpx;
 		
 	}
 	
@@ -255,9 +257,7 @@
 	}
 	.imgLine{
 		position: relative;
-		width: 150rpx;
-		height: 150rpx;
-		background: #F4F5F7;
+		width: 160rpx;
 		border-radius: 10rpx;
 		display: flex;
 		margin-right: 20rpx;
@@ -306,4 +306,7 @@
 		color: #FFFFFF;
 		font-size: 30rpx;
 	}
+	.lineCOnt{
+		width: 500rpx;
+	}
 </style>