Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/kotra/brand/detail.vue

@@ -248,7 +248,7 @@
 					res => {
 						if(res.resultCode==1){
 							this.details = res.data;
-							console.log(this.details)
+							
 							if(res.data.VideoUrl==''){
 								this.active=1
 							};
@@ -262,8 +262,6 @@
 								}
 								this.details.imgs.push(obj)
 							})
-							console.log(this.details.imgs)
-							
 						}
 					}
 				);

pages/kotra/brand/list.vue

 <template>
-	<div style="background-color: #f6f6f6;height: 100vh;padding-bottom: 50px;overflow: hidden;">
+	<div :style="{'background-color': '#f6f6f6','height': contentHeight+'px','overflow': 'hidden'}">
 		<view style="padding:5px 10px;">
 			<u-search placeholder="搜索品牌名称" :focus="false" :show-action="false" :clearabled="true" radius="40" v-model="msg.BrandName"
 			 @search="searchHandler" @custom="searchHandler" bg-color="#FFF" ></u-search>
@@ -10,9 +10,9 @@
 					:current="active" @change="changeHandler" :show-bar="true" :activeFontSize="34" :bold="true" height="100"
 					duration="0" font-size="28"></u-tabs>
 			</view>
-			<div style="width: 64rpx;height: 48rpx;display: table-cell; vertical-align: middle;text-align: right;">
+			<!-- <div style="width: 64rpx;height: 48rpx;display: table-cell; vertical-align: middle;text-align: right;">
 				<u-icon name="filter-o" color="#111" size="42"></u-icon>
-			</div>
+			</div> -->
 		</view>
 		<u-empty v-if="g.length == 0" text="暂无内容" mode="list"></u-empty>
 		<view style="height: calc(100% - 101px);padding:2px 10px;" v-if="g.length > 0">
@@ -47,7 +47,7 @@
 				  :margin-bottom="20"
 				  bg-color="#f6f6f6"
 				/>
-				<view style="width: 100%;height: 30px;"></view>
+				<!-- <view style="width: 100%;height: 30px;"></view> -->
 			</scroll-view>
 		</view>
 		<tabbars></tabbars>
@@ -89,7 +89,7 @@
 				page_count:1,
 				status: "loadmore",
 				g: [],
-				
+				contentHeight:0,
 			};
 		},
 		onLoad(options) {
@@ -105,7 +105,8 @@
 			uni.setNavigationBarTitle({
 				title: '品牌列表',
 			});
-			
+			let c = this.$uiConfig.is_bang ? 78 : 50;
+			this.contentHeight = this.$utils.calcContentHeight(c)+40;
 			
 		},
 		methods: {

pages/kotra/firstShop/firstShop.vue

@@ -134,12 +134,18 @@
 				<u-button shape="square" :ripple="true" @click='showdelete=true' :custom-style="{background:'#F70027',border:'none',color:'#FFF'}">删除</u-button>
 			</view>
 		</view>
+		
 		<u-modal v-model="showdelete" content="删除该首店认证？" :show-cancel-button='true'	 @cancel='showdelete=false' @confirm='deletebtn()'></u-modal>
+		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth>
 	</view>
 </template>
 
 <script>
+	import auth from "../../../components/auth/index.vue";
 	export default {
+		components: {
+		  auth
+		},
 		data() {
 			return {
 				pageTitle:'首店申请',
@@ -151,6 +157,7 @@
 					minute: false,
 					second: false
 				},
+				showAuth:false,
 				action: this.host2 + "/api/File/UploadTencent",
 				fileList:[],
 				showdelete:false,
@@ -204,10 +211,20 @@
 					title: '申请详情'
 				});
 			}else{
-				this.GetAuthenticationTypeEnumList()//类型
-				this.GetBrandTypeEnumList()//品牌归属地枚举
-				this.GetBusinessTypeEnumList()//申请认证行业枚举
-				this.GetAuthenticationCategoryEnumList()//认证分类枚举
+				this.u = uni.getStorageSync("mall_UserInfo");
+				if (!this.u) {
+				  this.u = {
+					nickName: "未登录",
+					avatarUrl: ""
+				  };
+				  this.showAuth = true;
+				}else{
+					this.GetAuthenticationTypeEnumList()//类型
+					this.GetBrandTypeEnumList()//品牌归属地枚举
+					this.GetBusinessTypeEnumList()//申请认证行业枚举
+					this.GetAuthenticationCategoryEnumList()//认证分类枚举
+				
+				}
 				let currentPages = getCurrentPages();
 				let u = "/" + currentPages[currentPages.length - 1].route;
 				let pages = wx.getStorageSync("basedata")
@@ -519,6 +536,17 @@
 					},
 				});
 			},
+			reloadUserinfo() {
+			  this.u = uni.getStorageSync("mall_UserInfo");
+			  this.GetAuthenticationTypeEnumList()//类型
+			  this.GetBrandTypeEnumList()//品牌归属地枚举
+			  this.GetBusinessTypeEnumList()//申请认证行业枚举
+			  this.GetAuthenticationCategoryEnumList()//认证分类枚举
+			},
+			//关闭登录窗口
+			gbAuth(){
+				uni.navigateBack()
+			},
 		}
 	}
 </script>

pages/kotra/firstShop/list.vue

@@ -28,14 +28,19 @@
 				/>
 			</scroll-view>
 		</view>
-		
+		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth>
 	</view>
 </template>
 
 <script>
+	import auth from "../../../components/auth/index.vue";
 	export default {
+		components: {
+		  auth
+		},
 		data() {
 			return {
+				showAuth:false,
 				mainColor:"",
 				typeList:[{Id:0,Name:'全部'},{Id:1,Name:'未审核'},{Id:2,Name:'审核通过'},{Id:3,Name:'审核不通过'}],
 				active:0,
@@ -60,7 +65,17 @@
 				title: '我的认证'
 			});
 			this.mainColor = this.$uiConfig.mainColor;
-			 this.init();
+			this.u = uni.getStorageSync("mall_UserInfo");
+			if (!this.u) {
+			  this.u = {
+				nickName: "未登录",
+				avatarUrl: ""
+			  };
+			  this.showAuth = true;
+			}else{
+				this.init();
+			}
+			 
 		},
 		methods: {
 			init() {
@@ -103,7 +118,16 @@
 			},
 			getsplice(index){
 				this.g.splice(index,1)
-			}
+			},
+			reloadUserinfo() {
+			  this.u = uni.getStorageSync("mall_UserInfo");
+			  // this.showAuth=false;
+			  this.init();
+			},
+			//关闭登录窗口
+			gbAuth(){
+				uni.navigateBack()
+			},
 		}
 	}
 </script>

pages/user-center/user-center.vue

@@ -26,7 +26,7 @@
 								 	<!-- 公司认证状态 -->
 								 	
 								 </view>
-							 	<view class="componyStatusBox" @click="goIdentification" v-if="is_show_korea==1">
+							 	<view class="componyStatusBox" @click="goIdentification" v-if="is_show_korea==1 && user_info.nickname">
 							 		<view class="renzhen" v-if="companyStatus==2 " >
 							 			未认证
 							 		</view>