Merge pull request '更新' (#8) from zyj into master

Reviewed-on: #8

customerManagement/companyManagement/detail.vue

@@ -133,7 +133,15 @@
 		data() {
 			return {
 				rowDetails: {},
-				detailList: [],
+				detailList: [{
+					bankCardName: '',
+					bankCardNo: '',
+					bankName: '',
+					interBankCode: '',
+					disabledType: false,
+					commonMark: 1,
+					companyId: ''
+				}],
 				id: '',
 				indexNature: 0,
 				bankNatureList: [{
@@ -191,7 +199,7 @@
 							}
 						}
 					});
-				}else{
+				} else {
 					uni.showToast({
 						title: '请把信息填写完整后提交',
 						icon: 'none'
@@ -214,7 +222,10 @@
 			findDetail(id) {
 				companyManagement.getByCompanyId(id).then(res => {
 					if (res.code !== 20000) return
-					this.detailList = res.data
+					if (res.data && res.data.length > 0) {
+						this.detailList = res.data
+					}
+
 				})
 			},
 			seleoli(item, index) {

customerManagement/companyManagement/index.vue

@@ -78,7 +78,7 @@
 									<view class="flex" style="padding: 15rpx 0;">
 										共享总公司额度
 										<view style="margin: 0 10rpx;min-width: 150rpx;" class="blackcolor">
-											{{ item.shareParentAmt =='0'?'共享':'不共享' }}
+											{{ item.shareParentAmt =='0'?'不共享':'共享' }}
 										</view>
 									</view>
 								</view>
@@ -91,9 +91,7 @@
 										</view>
 										<view class="flex" style="padding: 15rpx 0;">
 											联动分油
-											<switch class="my-switch" :class="item.parentMark ==0?'disabledMark':''"
-												:disabled="item.parentMark ==0?true:false"
-												:checked="item.shareDistribute=='1'?true:false"
+											<switch class="my-switch" :checked="item.shareDistribute=='1'?true:false"
 												style="transform:scale(0.7)" @change=" changeDistribute(item)"></switch>
 										</view>
 										<view class="flex" style="padding: 15rpx 0;">
@@ -167,6 +165,11 @@
 			},
 			changeEnableMark(item) {
 				const data = [item]
+				if(item.enableMark ==1){
+					data[0].enableMark = 0
+				}else{
+					data[0].enableMark = 1
+				}
 				companyManagement.updateBatchEnable(data).then(res => {
 					if (res.code === 20000) {
 						uni.showToast({
@@ -182,6 +185,12 @@
 					id: item.id,
 					shareDistribute: item.shareDistribute
 				}
+				if(item.shareDistribute == '1'){
+					data.shareDistribute = '0'
+				}else{
+					data.shareDistribute = '1'
+				}
+				console.log(data,item,'............iitem...')
 				companyManagement.openShareDistribute(data).then(res => {
 					if (res.code === 20000) {
 						uni.showToast({

financialCenter/enterpriseRecharge/index.vue

@@ -124,6 +124,7 @@
 			this.getList()
 		},
 		onLoad() {
+			this.getData.currentPage = 1
 			this.getList()
 		},
 		methods: {

siteManagement/OilSiteOilsPrice/index.vue

@@ -142,21 +142,21 @@
 						value: 'SQL',
 						label: '叁仟里'
 					},
-					{
-						value: 'LV',
-						label: '老吕（找油网）'
-					},
 					{
 						value: 'TY',
 						label: '团油'
 					},
-					{
-						value: 'YDJY',
-						label: '一点加油（壳牌）'
-					},
 					{
 						value: 'ZDC',
 						label: '掌多车'
+					},
+					{
+						value: 'LV',
+						label: '老吕（找油网）'
+					},
+					{
+						value: 'YDJY',
+						label: '一点加油（壳牌）'
 					}
 				],
 				sitePriceData: {},