微店的一些修改

pages/microShop/index/index.vue

@@ -304,7 +304,7 @@
 			let c = this.$uiConfig.is_bang ? 80 : 52;
 			this.contentHeight = this.$utils.calcContentHeight(c);
 			console.log(this.contentHeight)
-			if(this.contentHeight>690 ){
+			if(this.contentHeight>670 ){
 				this.modelstype=80
 			}
 		},
@@ -359,6 +359,11 @@
 					
 					this.getMicroShopBasics()
 					this.applyState = res.data.Id;
+					if (res.data.Id!=0&& res.data.AuditStatus==2) {
+					  let UserInfo = uni.getStorageSync('mall_UserInfo') ?uni.getStorageSync('mall_UserInfo'):{};
+						UserInfo.SmallShopId=res.data.Id
+						uni.setStorageSync("mall_UserInfo",  UserInfo );
+					}
 					this.AuditStatus = res.data.AuditStatus;
 					this.ApplyInfo = res.data;
 					if(this.AuditStatus ==1 || this.AuditStatus ==3){

pages/microShop/storeManagement/addGoods.vue

@@ -314,13 +314,14 @@
 	
 	.addGoodsStyle .allEdit{
 		width: 60px;
-		height: 24px;
-		border-radius: 12px;
+		height: 20px;
+		border-radius: 10px;
 		background: #FF4048;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		color: #FFFFFF
+		color: #FFFFFF;
+		font-size: 12px;
 	}
 	
 </style>

pages/microShop/storeManagement/goodsEdit.vue

@@ -8,9 +8,11 @@
 				</view>
 			</view>
 			<view style="width: 100%;padding: 0 15px;font-size: 10px;color: #8E8E8E;">
-				注：1，百分比范围：{{editMsg.CustomMinPriceRate}}% ~ {{editMsg.CustomMaxPriceRate}}%
+				<text style='width: 23px;display: inline-block;'>注：</text>
+				1，百分比范围：{{editMsg.CustomMinPriceRate}}% ~ {{editMsg.CustomMaxPriceRate}}%
 			</view>
 			<view style="width: 100%;padding: 0 15px;font-size: 10px;color: #8E8E8E" >
+				<text style='width: 23px;display: inline-block;'></text>
 				2，固定金额范围：{{editMsg.CustomMinFixedPrice}}元 ~ {{editMsg.CustomMaxFixedPrice}}元
 			</view>
 			<view class="SupplierListstyle">
@@ -18,10 +20,16 @@
 					<u-checkbox-group @change="SelectAll"  size='30'>
 						<u-checkbox v-model="allchecked" shape="circle" :active-color="mainColor">全选</u-checkbox>
 					</u-checkbox-group>
+					<view style="display: flex;flex-direction: row;">
+						<view class="allEdit" @click="batchset2" style="margin-right: 10px;">
+							清空
+						</view>
 						<view class="allEdit" @click="batchset" >
 							批量设置
 						</view>
 					</view>
+					
+				</view>
 				<view class="Sitem" v-for="(x, index2) in g.SpecificationList" :key="index2"  >
 					<u-checkbox-group @change="clickcheckbox(x)" size='30' style='margin-right: 5px;width: 50%; ' >
 						<u-checkbox v-model="x.checked" shape="circle" :active-color="mainColor" label-size='22'>
@@ -155,6 +163,7 @@
 					x.checked = false
 				})
 				this.gotype = options.type
+				console.log(this.g.SpecificationList)
 			}
 		},
 		created(){
@@ -280,6 +289,25 @@
 				this.ISpopup = true;
 				
 			},
+			batchset2(){
+				let show = true;
+				this.g.SpecificationList.forEach(x=>{
+					
+					if(x.checked == true){
+						show = false,
+						x.UpPrice = 0;
+						x.PriceType = 0;
+						x.checked = false
+					}
+				})
+				if(show==true){
+					uni.showToast({
+						title: '请至少选择一个规格',
+						icon: "none",
+					});
+					return
+				};
+			},
 			define(){
 				if(this.editMsg.PriceType==1 && (this.editMsg.UpPrice<this.editMsg.CustomMinPriceRate || this.editMsg.UpPrice>this.editMsg.CustomMaxPriceRate)){
 					uni.showToast({
@@ -297,6 +325,9 @@
 					this.editMsg.UpPrice = this.editMsg.CustomMinFixedPrice
 					return
 				}
+				uni.showLoading({
+					title: '设置中'
+				});
 				this.g.SpecificationList.forEach(x=>{
 					if(x.checked == true){
 						x.PriceType = this.editMsg.PriceType;
@@ -304,6 +335,7 @@
 						x.checked = false
 					}
 				})
+				uni.hideLoading();
 				this.allchecked = false
 				this.ISpopup = false;
 			},
@@ -511,7 +543,8 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		color: #FFFFFF
+		color: #FFFFFF;
+		font-size: 13px;
 	}
 	
 	.goodsEditStyle .popupbox_t{

pages/microShop/storeManagement/storeManagement.vue

@@ -79,10 +79,17 @@
 											<view class="Sitem_gg" >
 												<text v-for="(j, index3) in x.AttrList" :key="index3">{{j.attr_group_name}}:{{j.attr_name}}{{x.attr_list.length==index3+1?'':','}}</text>
 											</view>
-											<view class="Sitem_k" style="width: 20%;">原价:￥{{x.SellingPrice}}</view>
-											<view class="Sitem_k" v-if="x.PriceType ==1 " style="color: #007FFF;">百分比:{{x.UpPrice}} %</view>
-											<view class="Sitem_k" v-if="x.PriceType ==2 " style="color: #007FFF;">国定金额:{{x.UpPrice}}元</view>
+											<view class="Sitem_k" >原:￥{{x.SellingPrice}}</view>
+											<view class="Sitem_k" v-if="x.PriceType ==1 " style="color: #007FFF;">
+												<image src="../../../static/images/backtop.png" style="width: 16px;height: 16px;"></image>
+												{{x.UpPrice}}%
+											</view>
+											<view class="Sitem_k" v-if="x.PriceType ==2 " style="color: #007FFF;">
+												<image src="../../../static/images/backtop.png" style="width: 16px;height: 16px;"></image>
+												{{x.UpPrice}}元
+											</view>
 											<view class="Sitem_k" v-if="x.PriceType !=2&& x.PriceType !=1 " style="color: #FF4048;">未设置</view>
+											<view class="Sitem_k" >店:￥{{x.SmallShopsPrice}}</view>
 			
 											<u-icon name="arrow" v-if='item.showdetail==false && index2==0&&  item.SpecificationList.length>1' ></u-icon>
 											<u-icon name="arrow-down" v-if='item.showdetail==true && index2==0&&  item.SpecificationList.length>1'></u-icon>
@@ -120,7 +127,7 @@
 							<view></view>
 							<span v-if="editMsg.PriceType==1" style='font-size: 14px;color: #08090E;'>百分比</span>
 							<span v-if="editMsg.PriceType==2" style='font-size: 14px;color: #08090E;'>固定金额</span>
-							<span  v-if="editMsg.PriceType==null" style='font-size: 14px;color: #08090E;'>请选择</span>
+							<span  v-if="editMsg.PriceType==0" style='font-size: 14px;color: #08090E;'>请选择</span>
 							<u-icon name="arrow-down" size="20" color="#000"></u-icon>
 						</view>
 						<span v-if="editMsg.PriceType==1" style='font-size: 11px;'>百分比范围：{{editMsg.CustomMinPriceRate}}% ~ {{editMsg.CustomMaxPriceRate}}%</span>
@@ -523,7 +530,7 @@
 		
 	}
 	.storeManagementStyle .Sitem_gg{
-		width: 50%;
+		width: 41%;
 		text-overflow: -o-ellipsis-lastline;
 		overflow: hidden;
 		text-overflow: ellipsis;
@@ -533,8 +540,12 @@
 		-webkit-box-orient: vertical;
 	}
 	.Sitem_k{
-		width: 25%;
-		text-align: center
+		width: 18%;
+		text-align: center;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
 	}
 	.storeManagementStyle .popupbox{
 		width: 100%;

pages/user-center/user-center.vue

@@ -268,7 +268,7 @@ export default {
 				}
 				//关闭
 				else{
-					if(this.mall_UserInfo.SmallShopId!=0)
+					if(this.mall_UserInfo.SmallShopId&&this.mall_UserInfo.SmallShopId!=0)
 					{
 						flag=true;
 					}