lilei 6 月之前
父節點
當前提交
a3972d1793

+ 1 - 0
pages/index/index.vue

@@ -457,6 +457,7 @@
 			getHasShopping(flag){
 				getShopStatus().then(res => {
 					const hasShopiing = res.data && res.data.paramValue == 1
+					this.$store.state.vuex_showShopAuth = hasShopiing
 					// 经销商开启商城
 					if(hasShopiing){
 						// 判断员工是否开启商城

+ 1 - 1
pages/morePage/morePage.vue

@@ -304,7 +304,7 @@
 							{
 								text: '商城显示设置',
 								icon: 'shangcheng',
-								auth: this.hasShopSeting,
+								auth: this.$store.state.vuex_showShopAuth&&this.userInfo&&this.userInfo.superAdmin == 1,
 								path: '/pagesB/shopShow/shopShow',
 								color: '#00aa00',
 								isShelf: true

+ 14 - 4
pages/storeManage/roleSetting/roleAuthSet.vue

@@ -4,7 +4,7 @@
 			<view class="leve_0">
 				<view class="leve_1">
 					<label @click="checkAll()">
-						<checkbox :checked="checkedAll" /> {{checkedAll?'取消全部':'全部'}}
+						<checkbox :checked="checkedAll" /> {{checkedAll?'取消全选':'全选'}}
 					</label>
 				</view>
 			</view>
@@ -154,12 +154,22 @@
 			flex-grow: 1;
 			overflow: auto;
 			height: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
 			.leve_0{
 				padding:0;
+				width: 48%;
+				&:first-child{
+					width:100%;
+					margin-bottom: 20rpx;
+					.leve_1{
+						border-bottom: 1px solid #eee;
+					}
+				}
 				.leve_1{
-					padding: 15upx;
-					border-bottom: 1px solid #eee;
-					uni-label{
+					padding:10rpx 15rpx;
+					label{
 						display: block;
 					}
 				}

+ 1 - 0
store/index.js

@@ -66,6 +66,7 @@ const store = new Vuex.Store({
 		vuex_tempData: null, // 临时数据
 		vuex_configPrice: null, // 价格显示配置
 		vuex_hasShopiing: false, // 是否有商城
+		vuex_showShopAuth: false, // 是否显示商城设置
 		vuex_uuidTempData: lifeData.vuex_uuidTempData ? lifeData.vuex_uuidTempData : null, // 唯一码临时数据
 		vuex_cartList: lifeData.vuex_cartList ? lifeData.vuex_cartList : [], // 购物车列表按活动缓存
 		vuex_tabBarList: [

+ 5 - 3
uni_modules/uni-grid/components/uni-grid/uni-grid.vue

@@ -79,7 +79,7 @@
 							item.width = width
 						})
 					})
-				}, 50)
+				}, 500)
 			},
 			change(e) {
 				this.$emit('change', e)
@@ -91,8 +91,10 @@
 					.select(`#${this.elId}`)
 					.boundingClientRect()
 					.exec(ret => {
-						this.width = parseInt((ret[0].width - 1) / this.column) + 'px'
-						fn(this.width)
+						if(ret[0]){
+							this.width = parseInt((ret[0].width - 1) / this.column) + 'px'
+							fn(this.width)
+						}
 					})
 				// #endif
 				// #ifdef APP-NVUE