lilei 11 月之前
父节点
当前提交
04e352c7c5

+ 1 - 1
pages/promo/index.vue

@@ -35,7 +35,7 @@
 		data() {
 			return {
 				status: 'loading',
-				noDataText: '暂无数据',
+				noDataText: '暂无活动',
 				// 查询条件
 				pageNo: 1,
 				pageSize: 10,

+ 1 - 2
pages/storeManage/addPerson.vue

@@ -51,7 +51,7 @@
 				</evanForm>
 			</view>
 			<view class="form-footer-btn flex align_center justify_center">
-				<u-button shape="circle" v-if="isEdit" @click="delPerson()" :custom-style="{width:'300rpx',marginRight:'20rpx' }">删除</u-button>
+				<u-button shape="circle" v-if="isEdit&&formData.isManager==0" @click="delPerson()" :custom-style="{width:'300rpx',marginRight:'20rpx' }">删除</u-button>
 				<u-button shape="circle" type="info" :custom-style="{ background: '#066cff', color: '#fff',width:'300rpx' }" @click="save('formData')">保存</u-button>
 			</view>
 	</view>
@@ -155,7 +155,6 @@
 			//  保存
 			save(name){
 				let data=this.formData
-				console.log(data)
 				this.$refs[name].validate((valid) => {
 				  if (valid) {
 					if(!this.formData.roleNames && this.formData.isManager==0){

+ 4 - 1
pages/storeManage/personnel.vue

@@ -34,7 +34,7 @@
 			</swiper-item>
 		</swiper>
 		<view class="footer flex align_center justify_center">
-			<u-button @click="editIsManage()" v-if="userInfo&&userInfo.superAdmin==1" :throttle-time="100" shape="circle" type="error" plain>
+			<u-button @click="editIsManage()" v-if="userInfo&&userInfo.superAdmin==1&&!hasOnlyAdmin" :throttle-time="100" shape="circle" type="error" plain>
 				更换负责人
 			</u-button>
 			<u-button @click="editPerson(null)" :throttle-time="100" :custom-style="{ background: '#066cff', color: '#fff' }" shape="circle" type="info">
@@ -69,6 +69,9 @@
 			userInfo(){
 				return this.$store.state.vuex_userInfo
 			},
+			hasOnlyAdmin(){
+				return this.list.length ==1 && this.list[0].isManager == 1 || this.list.length == 0
+			}
 		},
 		methods:{
 			// 查询列表

+ 7 - 3
pages/storeManage/roleSetting/addRole.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container flex flex_column">
-		<view style="flex-grow: 1;">
+		<view style="flex-grow: 1;padding-bottom: 120rpx;">
 			<evan-form ref="formData" :rules="ruleValidate" :model="formData">
 				<evan-form-item label="岗位名称:" prop="name">
 					<u-input class="form-input" :maxlength="30" style="width: 100%;" placeholder="请填写岗位名称(最多30个字符)" v-model="formData.name" />
@@ -57,7 +57,6 @@
 			}
 		},
 		onLoad(options) {
-			console.log(options)
 			this.type = options.type
 			uni.setNavigationBarTitle({
 				title: this.type=="add" ? '添加岗位' : '编辑岗位'
@@ -84,7 +83,6 @@
 				  if (valid) {
 					  this.loading = true
 					  const menusIds = this.$refs.roleSet.getSelMenu()
-					  console.log(menusIds,'menus--')
 					  if(!menusIds){
 						  uni.showToast({
 						  	icon: 'none',
@@ -144,6 +142,8 @@
 	.container{
 		margin: 0 30rpx;
 		height: 100vh;
+		position: relative;
+		overflow: auto;
 		.form-input-placeholder{
 			text-align: right;
 		}
@@ -154,6 +154,10 @@
 		.form-footer-btn{
 			padding: 20rpx;
 			background: #FFFFFF;
+			width: 100%;
+			position: fixed;
+			bottom: 0;
+			left: 0;
 		}
 	}
 </style>