shipeng 1 месяц назад
Родитель
Сommit
67ba3e2061
2 измененных файлов с 36 добавлено и 16 удалено
  1. 30 9
      pages/distributor/index.vue
  2. 6 7
      pages/me/index.vue

+ 30 - 9
pages/distributor/index.vue

@@ -33,8 +33,8 @@
 						<u-checkbox-group placement="column" @change="checkboxChange">
 							<view v-for="(item,index) in dataList" :key="item.id" class="item u-flex">
 								<u-checkbox v-if="serialType==0||serialType==2" shape="circle" activeColor="#ED0000" :key="index"
-									:name="item.name" :checked="item.checked" @change="toggleCheck(index)" class="checkbox" />
-								<view :class="['item-box',serialType==0||serialType==2 ? 'item-box-shadow':'']">
+									:name="item.name" :checked="item.checked" :disabled="item.ifUnionShare === 1" @change="toggleCheck(index)" class="checkbox" />
+								<view :class="['item-box',serialType==0||serialType==2 ? 'item-box-shadow':'']" @click="showInfo(item)">
 									<view class="text u-flex u-row-between text-order">
 										<view class="name">订单号:{{item.orderId}}</view>
 									</view>
@@ -234,7 +234,7 @@
 						if(res.data.rows){
 							let list = JSON.parse(JSON.stringify(this.dataList))
 							res.data.rows.forEach(item => {
-								item.checked = false;
+								item.checked = false;
 								list.push({
 									...item,
 									class: {
@@ -340,10 +340,15 @@
 			// 切换全选状态
 			allCheckboxChange(n) {
 				// console.log('allCheckboxChange',n[0]);
-				console.log('allCheckboxChange', n);
-				let selectAll = n[0] ? true : false;
-				this.dataList.forEach(item => {
-					item.checked = selectAll
+				// console.log('allCheckboxChange', n);
+				let selectAll = n[0] ? true : false;
+				// console.log('selectAll', selectAll);
+				this.dataList.forEach(item => {
+					if(item.ifUnionShare === 1) {
+						item.checked = false
+					} else {
+						item.checked = selectAll
+					}
 				})
 			},
 			checkboxClick() {
@@ -367,8 +372,24 @@
 				// 	return
 				// }
 				this.dataList[index].checked = !this.dataList[index].checked
+			},
+			//
+			showInfo(item) {
+				if(item.ifUnionShare === 1) {
+					uni.showModal({
+					  title: '提示',
+					  content: '因分销系统内部更新,2025年4月20日之前产生的分销佣金,将会延迟10-15个工作日发放,给您带来不便,我们深感抱歉。',
+					  showCancel: false,
+					  confirmText: '关闭', 
+					  success: res => {
+						// console.log(11,'111');
+					  },
+					  complete() {
+					  }
+					})
+				}
 			},
-			submitorder() {
+			submitorder() {
 				let personList = this.selectGoods.map(item=>{
 					return {personsId:item.id,withdrawTotal:item.withdrawTotal}
 				});
@@ -376,7 +397,7 @@
 					withdrawTotal:this.totalPrice,
 					personList:JSON.stringify(personList)
 				};
-				// console.log('selectGoods', this.selectGoods);
+				// console.log('selectGoods', this.selectGoods);
 				uni.$u.route('/pages/cash/index', params);
 			},
 			getViewers() {

+ 6 - 7
pages/me/index.vue

@@ -99,7 +99,7 @@
 	
 		
 		mounted() {
-			console.log('wpsdfsfasdfads')
+			// console.log('wpsdfsfasdfads')
 			this.statusBarHeight = getApp().globalData.statusBarHeight
 			this.show = false
 			this.getUserInfo() 
@@ -108,7 +108,7 @@
 			// #endif
 		},
 		destroyed() {
-			console.log("dsfadsfsdfasdf")
+			// console.log("dsfadsfsdfasdf")
 			//window.removeEventListener("popstate", this.browserBack);
 		},
 		methods: {
@@ -123,11 +123,11 @@
 					let res = await this.$u.api.getInfo({
 						noSign: 1,
 						userid: this.distribution_user_info.userId
-					})
-					this.isShowQrcode = res.data.unionFlag
+					})
+					this.isShowQrcode = res.data.qrcodeStatus
 					if(this.isShowQrcode === 0) {
 						this.show = true
-					}else {
+					} else {
 						this.getRetailQrcode()
 					}
 				}
@@ -168,7 +168,6 @@
 						noSign: 1,
 						userid: this.distribution_user_info.userId
 					})
-					
 					if(res && res.code ===200) {
 						this.$refs.customPromotionCode.initData(res.data)
 						// #ifdef H5
@@ -268,7 +267,7 @@
 			/** 入网认证  */
 			networkConfirm() {
 				this.show = false
-				navigateTo('/pages/networkAuth/index')
+				// navigateTo('/pages/networkAuth/index')  // 去除跳转(20250418)
 				//this.getUnionAccessUrlFun()
 			},
 			networkCancel() {