111

pages/index/peopleList.vue

@@ -25,9 +25,9 @@
 					</view>
 				</view>
 			</view>
-			<!-- 物流公司、快递公司、啦包公走这一套 -->
+			<!-- 物流公司啦包公走这一套 -->
 			<view class="" v-else>
-				<view class="list-1" :style="{height:popleType == 'kdName'?'75rpx':'120rpx'}" style="display: flex;position: relative;" @tap="clickList(item)" v-for="item in popleList" :key="item">
+				<view class="list-1" :style="{height:popleType == 'kdName'?'75rpx':'120rpx'}" style="display: flex;position: relative;" @tap="clickList(item)" v-for="item in popleList[0]" :key="item">
 					<view class="name-tel">
 						<text style="line-height: 75rpx;">{{item.companyName}}</text>
 						<text style="line-height: 75rpx;">{{item.shippingMethod}}</text>
@@ -43,7 +43,44 @@
 					<view style="position: absolute;bottom: 0;left: 40rpx;" v-if="popleType == 'fcName' || popleType == 'lbgName' || popleType == 'wlName'">
 						<text style="line-height: 45rpx;color:red;font-size: 24rpx;" v-if="item.rebateAmount">本单返佣{{item.rebateAmount}}元</text>
 					</view>
+				</view>
+				<view class="list-1" :style="{height:popleType == 'kdName'?'75rpx':'120rpx'}" style="display: flex;position: relative;" @tap="clickList(item)" v-for="item in popleList[1]" :key="item">
+					<view class="name-tel">
+						<text style="line-height: 75rpx;">{{item.companyName}}</text>
+						<text style="line-height: 75rpx;">{{item.shippingMethod}}</text>
+						<text style="line-height: 75rpx;">{{item.workerName}}</text>
+					</view>
+					<view class="standard-box" @tap.stop="toggle('center',item.remark || item.chargingStandard)">
+						<view class="">
+							<text style="padding-left:40rpx;">收费标准</text>
+							<uni-icons type="info" color='#088FEB' size="16" style="line-height: 75rpx;"></uni-icons>
+						</view>
+						<view class="phone-btn" @tap.stop="clickPhone(item.mobile)" v-if="popleType != 'kdName'">拨打电话</view>
+					</view>
+					<view style="position: absolute;bottom: 0;left: 40rpx;" v-if="popleType == 'fcName' || popleType == 'lbgName' || popleType == 'wlName'">
+						<text style="line-height: 45rpx;color:red;font-size: 24rpx;" v-if="item.rebateAmount">本单返佣{{item.rebateAmount}}元</text>
+					</view>
 				</view>
+			</view>
+			<!--快递公司 -->
+			<view class="" v-else>
+				<view class="list-1" :style="{height:popleType == 'kdName'?'75rpx':'120rpx'}" style="display: flex;position: relative;" @tap="clickList(item)" v-for="item in popleList" :key="item">
+					<view class="name-tel">
+						<text style="line-height: 75rpx;">{{item.companyName}}</text>
+						<text style="line-height: 75rpx;">{{item.shippingMethod}}</text>
+						<text style="line-height: 75rpx;">{{item.workerName}}</text>
+					</view>
+					<view class="standard-box" @tap.stop="toggle('center',item.remark || item.chargingStandard)">
+						<view class="">
+							<text style="padding-left:40rpx;">收费标准</text>
+							<uni-icons type="info" color='#088FEB' size="16" style="line-height: 75rpx;"></uni-icons>
+						</view>
+						<view class="phone-btn" @tap.stop="clickPhone(item.mobile)" v-if="popleType != 'kdName'">拨打电话</view>
+					</view>
+					<view style="position: absolute;bottom: 0;left: 40rpx;" v-if="popleType == 'fcName' || popleType == 'lbgName' || popleType == 'wlName'">
+						<text style="line-height: 45rpx;color:red;font-size: 24rpx;" v-if="item.rebateAmount">本单返佣{{item.rebateAmount}}元</text>
+					</view>
+				</view>
 			</view>
 		</view>
 		<view>
@@ -94,7 +131,7 @@
 				this.khOrGysList();
 			} else if (options.popleType == 'wlName' || options.popleType == 'kdName') { //物流快递
 				this.wlOrKdList(options.popleType)
-			} else if (options.popleType == 'fcName') {
+			} else if (options.popleType == 'fcName' || options.popleType == 'dbName') {
 				this.wlOrKdList(options.popleType)
 			} else {
 				this.kdyOrlbgList();
@@ -151,10 +188,25 @@
 						shippingType:4
 					}
 					url = '/app/operatingArea/getByArea'
+				}else if (e == 'dbName') {
+					isTrue = true
+					data = {
+						province:this.khName.province,
+						city:this.khName.city,
+						area:this.khName.area,
+						shippingType:5
+					}
+					url = '/app/operatingArea/getByArea'
 				}
 				this.tui.request(url, "post", data, false, isTrue).then((res) => {
-					if (res.code == 200) {
+					if (res.code == 200) {
-						this.popleList = res.result;
+						if(e == 'kdName'){
+							this.popleList = res.result;
+						}else{
+							this.popleList.push(res.result.operatingAreaList)
+							this.popleList.push(res.result.logiticsCompanyList)
+							console.log(this.popleList)
+						}
 					}else{
 						this.tui.toast(res.message)
 					}

pages/inventory/goodsList1.vue

@@ -204,6 +204,16 @@
 								<uni-icons type="right" size="16"
 									style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons>
 							</view>
+						</view>
+						<view class="content-list" v-if="radioType == '5'">
+							<view class="list-name" style="width:150rpx;padding-left:0;">选择车号</view>
+							<view class="list-val">
+								<input type="text" placeholder="请选择" disabled :value="wlName.shippingMethod"
+									style="border-bottom: 1px solid #fff;text-align: center;"
+									@tap.stop="goPopleList('dbName')">
+								<uni-icons type="right" size="16"
+									style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons>
+							</view>
 						</view>
 						<view class="content-list" v-if="radioType !=''">
 							<view class="list-name" style="padding-left:0;">配送方式</view>