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,
@@ -203,11 +210,21 @@
 				uni.setNavigationBarTitle({
 					title: '申请详情'
 				});
+			}else{
+				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.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/kotra/identification.vue

@@ -18,12 +18,13 @@
 						</view>
 						<view class="con1" v-if="item.type==1">
 							<input class="input" type="text" v-model="dataOne[item.field]" :placeholder="item.text"
-								placeholder-style="color: #CECECEFF" @focus="inputFcous(item)"/>
+								placeholder-style="color: #CECECEFF" @focus="inputFcous(item)" />
 							<view style="width: 50rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;position: absolute;
 							top: -2rpx;
 							right: 10rpx;
 							z-index: 10;" @click="delInputText(item.field)">
-									<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/delete.png" v-if="item.delIcon" class="delIcon" mode="widthFix" ></image>
+								<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/delete.png"
+									v-if="item.delIcon" class="delIcon" mode="widthFix"></image>
 							</view>
 
 						</view>
@@ -49,18 +50,20 @@
 						</view>
 						<view class="con1" v-if="item.type==1">
 							<input class="input" type="text" v-model="dataTwo[item.field]" :placeholder="item.text"
-								placeholder-style="color: #CECECEFF" @focus="inputFcous(item)"/>
+								placeholder-style="color: #CECECEFF" @focus="inputFcous(item)" />
 							<view style="width: 50rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;position: absolute;
 								top: -2rpx;
 								right: 10rpx;
 								z-index: 10;" @click="delInputText(item.field)">
-										<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/delete.png" v-if="item.delIcon" class="delIcon" mode="widthFix" ></image>
+								<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/delete.png"
+									v-if="item.delIcon" class="delIcon" mode="widthFix"></image>
 							</view>
 						</view>
 						<view class="con3" v-if="item.type==2">
 							<view class="numberBbox">
 								<image class="numberImg" :src="reduceIcon" mode="widthFix" @click="reduce"></image>
-								<input class="numberInput" type="number" disabled v-model.number="dataTwo[item.field]" />
+								<input class="numberInput" type="number" disabled
+									v-model.number="dataTwo[item.field]" />
 								<image class="numberImg" :src="addIcon" mode="widthFix" @click="add"></image>
 							</view>
 						</view>
@@ -89,8 +92,8 @@
 									</view>
 								</view>
 							</view>
-							<input type="text" class="customTypeInput" v-model="dataTwo.CustomerOtherType" placeholder="以上都不合适，可在此输入客户群体"
-								placeholder-style="color: #CECECEFF" />
+							<input type="text" class="customTypeInput" v-model="dataTwo.CustomerOtherType"
+								placeholder="以上都不合适，可在此输入客户群体" placeholder-style="color: #CECECEFF" />
 						</view>
 					</view>
 				</view>
@@ -103,12 +106,13 @@
 						</view>
 						<view class="con1" v-if="item.type==1">
 							<input class="input" type="text" v-model="dataThree[item.field]" :placeholder="item.text"
-								placeholder-style="color: #CECECEFF" @focus="inputFcous(item)"/>
+								placeholder-style="color: #CECECEFF" @focus="inputFcous(item)" />
 							<view style="width: 50rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;position: absolute;
 								top: -2rpx;
 								right: 10rpx;
 								z-index: 10;" @click="delInputText(item.field)">
-										<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/delete.png" v-if="item.delIcon" class="delIcon" mode="widthFix" ></image>
+								<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/delete.png"
+									v-if="item.delIcon" class="delIcon" mode="widthFix"></image>
 							</view>
 						</view>
 						<view class="con6" v-if="item.type==2">
@@ -122,7 +126,8 @@
 						<view class="con3" v-if="item.type==3">
 							<view class="sliderCurNumBox">
 								<view style="display: flex; align-items: baseline;" v-if="dataThree.AreaRequirement>0">
-								<input class="sliderCurNum" disabled type="text" v-model="dataThree.AreaRequirement" />-
+									<input class="sliderCurNum" disabled type="text"
+										v-model="dataThree.AreaRequirement" />-
 								</view>
 								<input class="sliderCurNum" disabled type="text"
 									v-model="dataThree.EndAreaRequirement" />m²
@@ -139,6 +144,8 @@
 					</view>
 				</view>
 			</view>
+			<!-- 审核未通过 -->
+			<view v-if="dataOne.CompanyStatus!=1">
 				<view class="butBox" @click="nextStep">
 					<image :src="nextIcon" class="next" mode="widthFix" v-if="step!=3"></image>
 					<text v-if="step==3">完成</text>
@@ -147,6 +154,14 @@
 					<text @click="finish">跳过</text>
 				</view>
 			</view>
+			<!-- 审核通过 -->
+			<view class="butBox" v-if="dataOne.CompanyStatus==1" @click="backBtn">
+				<image :src="nextIcon" class="next" mode="widthFix" v-if="step!=3"></image>
+				<text v-if="step==3">返回</text>
+			</view>
+		</view>
+
+	</view>
 	</view>
 </template>
 
@@ -170,31 +185,31 @@
 				// type=1：输入框，2：照片
 				stepOneList: [{
 					name: "营业执照",
-					tip:"(点击图片上传营业执照)",
+					tip: "(点击图片上传营业执照)",
 					type: 2
 				}, {
 					name: "企业名称",
 					text: "请输入企业名称",
 					field: "CompanyName",
-					delIcon:false,
+					delIcon: false,
 					type: 1
 				}, {
 					name: "统一社会信用代码",
 					text: "输入18位社会信用代码",
 					field: "UnifiedCode",
-					delIcon:false,
+					delIcon: false,
 					type: 1
 				}, {
 					name: "法人代表",
 					text: "请输入法人姓名",
 					field: "LegalPerson",
-					delIcon:false,
+					delIcon: false,
 					type: 1
 				}, {
 					name: "联系电话",
 					text: "请输入11位手机或者带区号座机号码",
 					field: "Mobile",
-					delIcon:false,
+					delIcon: false,
 					type: 1
 				}, ],
 				//type=1：输入框，2：步进器，3：多选
@@ -202,7 +217,7 @@
 					name: "品牌名称",
 					text: "请输入品牌名称",
 					field: "BrandName",
-					delIcon:false,
+					delIcon: false,
 					type: 1
 				}, {
 					name: "店铺数量",
@@ -218,11 +233,11 @@
 					name: "品牌定位",
 					text: "请输入品牌定位",
 					field: "FullBrandName",
-					delIcon:false,
+					delIcon: false,
 					type: 1
 				}, {
 					name: "客户群体",
-					tip:"(可多选)",
+					tip: "(可多选)",
 					text: "",
 					field: "CustomerType",
 					type: 4,
@@ -233,11 +248,11 @@
 					name: "扩店区域",
 					text: "请输入扩店区域",
 					field: "StoreExpansion",
-					delIcon:false,
+					delIcon: false,
 					type: 1
 				}, {
 					name: "商品性质 ",
-					tip:"(单选)",
+					tip: "(单选)",
 					text: "",
 					field: "ProjectType",
 					type: 2
@@ -269,7 +284,7 @@
 					EndBuiltUpArea: 0,
 					FullBrandName: "",
 					CustomerType: "",
-					CustomerOtherType:""
+					CustomerOtherType: ""
 				},
 				reduceIcon: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/reduceIcon.png",
 				addIcon: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/addIcon.png",
@@ -291,21 +306,22 @@
 				AreaRequire: [],
 				AreaRequireMin: 0,
 				AreaRequireMax: 100,
+				finishBtn: "完成",
 			}
 		},
 		methods: {
 			// 输入框获取焦点
-			inputFcous(e){
-				e.delIcon=true
+			inputFcous(e) {
+				e.delIcon = true
 			},
-			delInputText(field){
-				this.dataOne[field]=""
-				this.dataTwo[field]=""
-				this.dataThree[field]=""
+			delInputText(field) {
+				this.dataOne[field] = ""
+				this.dataTwo[field] = ""
+				this.dataThree[field] = ""
 			},
 			// 输入框失去焦点
-			inputBlur(e){
-				e.delIcon=false
+			inputBlur(e) {
+				e.delIcon = false
 			},
 			// 获取客户群体枚举
 			getCustomerTypeEnumList() {
@@ -508,9 +524,10 @@
 					}
 				})
 			},
-			finish(){
+			//返回个人中心
+			finish() {
 				uni.navigateTo({
-				 	url:"/pages/user-center/user-center"
+					url: "/pages/user-center/user-center"
 				})
 			},
 			//下一步
@@ -543,12 +560,31 @@
 						//审核中或审核通过就不提交请求
 						if (this.dataOne.CompanyStatus == 0 || this.dataOne.CompanyStatus == 1) {
 							this.finish()
-						}else{
+						} else {
 							this.stepThree()
 						}
 					}
 				}
 			},
+			// 审核通过
+			backBtn(){
+				if (this.percent > 100) {
+					this.percent = 100
+				}
+				if (this.step == 1) {
+					this.stepName = "第2步 品牌信息"
+					this.nextSepName = "第3步"
+					this.step++
+					this.percent += this.percent
+				}else if(this.step == 2){
+					this.stepName = "第3步 扩店需求"
+					this.nextSepName = "完成"
+					this.step++
+					this.percent += this.percent
+				}else if(this.step == 3){
+					this.finish()
+				}
+			},
 			chooseType(item) { //选择客户群体
 				item.checked = !item.checked
 			},
@@ -579,7 +615,7 @@
 					url: "/api/AppletTrade/GetUserCompany",
 				}
 				this.request2(parms, (res) => {
-					if (res.resultCode == 1&&res.data!=null) {
+					if (res.resultCode == 1 && res.data != null) {
 						this.dataOne = res.data
 						this.businessLicenseUploadIsSuccess = true
 						that.getUserCompanyBrand(res.data.CompanyId)
@@ -718,7 +754,8 @@
 						font-weight: bold;
 						color: #1F1F1F;
 						margin-bottom: 38rpx;
-						.tip{
+
+						.tip {
 							font-weight: 400;
 							color: #AAAAAAFF;
 							margin-left: 10rpx;
@@ -728,6 +765,7 @@
 					.con1 {
 						height: 60rpx;
 						position: relative;
+
 						.input {
 							// width: 100%;
 							font-size: 32rpx;
@@ -736,10 +774,11 @@
 							color: #000000;
 							border-bottom: 1rpx solid #DADCE6;
 							padding-bottom: 24rpx;
-							vertical-align:baseline;
+							vertical-align: baseline;
 							padding-right: 50rpx;
 						}
-						.delIcon{
+
+						.delIcon {
 							width: 32rpx;
 							height: 32rpx;
 							// width: 100%;
@@ -831,7 +870,8 @@
 							}
 
 						}
-						.customTypeInput{
+
+						.customTypeInput {
 							font-size: 32rpx;
 							font-family: PingFang SC;
 							font-weight: bold;

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>