11

pages/index/peopleList.vue

@@ -40,7 +40,7 @@
 						<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;">本单返佣2元</text>
+						<text style="line-height: 45rpx;color:red;font-size: 24rpx;">本单返佣{{item.rebateAmount}}元</text>
 					</view>
 				</view>
 			</view>
@@ -86,9 +86,9 @@
 		onLoad(options) {
 			this.popleType = options.popleType
 			this.companyType = options.companyType || ''
-			this.khName = JSON.parse(options.khName) || ''
+			if(options.khName){
-			console.log(this.khName)
+				this.khName = JSON.parse(options.khName) || ''
-			// this.radioType = options.radioType
+			}
 			if (options.popleType == 'khName' || options.popleType == 'gysName') { //供应商或者客户
 				this.khOrGysList();
 			} else if (options.popleType == 'wlName' || options.popleType == 'kdName') { //物流快递

pages/inventory/goodsList1.vue

@@ -188,7 +188,7 @@
 							<view class="list-name" style="width:150rpx;padding-left: 0;">
 								{{radioType == '0'? '选择物流' :'选择快递'}}</view>
 							<view class="list-val">
-								<input type="text" placeholder="请选择" disabled :value="wlName.companyName"
+								<input type="text" placeholder="请选择" disabled :value="wlName.companyName || wlName.shippingMethod"
 									style="border-bottom: 1px solid #fff;text-align: center;padding-right: 54rpx;"
 									@tap.stop="goPopleList(radioType == '0'? 'wlName' :'kdName')">
 								<uni-icons type="right" size="16"
@@ -198,7 +198,7 @@
 						<view class="content-list" v-if="radioType == '4'">
 							<view class="list-name" style="width:150rpx;padding-left:0;">选择车号</view>
 							<view class="list-val">
-								<input type="text" placeholder="请选择" disabled :value="wlName.companyName"
+								<input type="text" placeholder="请选择" disabled :value="wlName.shippingMethod"
 									style="border-bottom: 1px solid #fff;text-align: center;"
 									@tap.stop="goPopleList('fcName')">
 								<uni-icons type="right" size="16"
@@ -389,10 +389,7 @@
 						value: '0',
 						name: '物流'
 					},
-					{
+					
-						value: '1',
-						name: '快递'
-					},
 					{
 						value: '3',
 						name: '拼包'
@@ -401,6 +398,10 @@
 						value: '4',
 						name: '发车'
 					},
+					{
+						value: '1',
+						name: '快递'
+					},
 					{
 						value: '2',
 						name: '自提'
@@ -1074,7 +1075,7 @@
 						remark: this.remark,
 						otherExpense: this.otherExpense == '' ? 0 : this.otherExpense, //其他费用
 						shareAddress: this.pbAddress,
-						transCompany: this.wlName.id,
+						transCompany: this.wlName.shippingMethodId || this.wlName.id,
 						companyName: this.wlName.companyName,
 					},
 					saleDetailList: []
@@ -1537,7 +1538,7 @@
 	}
 
 	.uni-list-cell {
-		margin-right: 20rpx;
+		margin-right: 110rpx;
 		display: flex;
 		float: left;
 	}

pages/login/login.vue

@@ -70,9 +70,9 @@
 	export default {
 		data() {
 			return {
-				mobile: '15533910775',
+				mobile: '15630117759',
 				// username: '15101147760',
-				username: '15533910775',
+				username: '15630117759',
 				code: '',
 				// password: '123456',
 				password: '19950123kang',

pages/other/logisticsAddress.vue

@@ -55,7 +55,7 @@
 				standardList:[],
 				status: 'loadmore',
 				pages:1,
-				total:0,
+				total:1,
 				rules: {
 					address1: {
 						rules: [{
@@ -82,9 +82,9 @@
 			this.getList()
 		},
 		onReachBottom() {
-			if (this.pages >= this.total) return;
+			if (this.total >= this.pages) return;
 			this.status = 'loading';
-			this.pages = ++this.pages;
+			this.total += 1;
 			this.getList();
 		},
 		methods: {
@@ -94,7 +94,7 @@
 				uni.request({
 					url: that.tui.interfaceUrl() + '/app/operatingArea/getOperatingAreaList',
 					data: {
-						pageNum:this.pages,
+						pageNum:this.total,
 						pageSize:10,
 						shippingMethodId:uni.getStorageSync("transCompany")
 					},
@@ -109,7 +109,6 @@
 						this.status = 'nomore';
 						if (res.data.code == 200){
 							this.pages = res.data.result.pages
-							this.total = res.data.result.total
 							if (this.pages == 1) {
 								this.standardList = res.data.result.records
 							} else {