11

components/rubik/index.vue

 <template>
-  <view
-    class="ad-box"
-	:class="{'ad-box-full':ad.list[0].link[0].PageName == 'full'}"
-    :style="{ height: ad.height == 'auto' ? 'auto' : ad.height + 'rpx',padding:marginStyle,backgroundColor:ad.background }"
-  >
-    <view
-      class="ad-chi"
-      v-for="(item, index) in adtemp"
-      :key="index"
-      :style="[item.formatStyle]"
-	  :class="{'ad-full-height':item.link[0].PageName == 'full'}"
-      @click="clickHandler(item.link[0].new_link_url)"
-    >
-	  <button open-type="contact" v-if="item.link[0].new_link_url=='contact'"></button>
-      <img :src="item.pic_url" style="margin-bottom:-4px" mode="widthFix"/>
-    </view>
-    <view class="hots" v-for="(x, i) in hotspots" :key="i" :style="[x.formatStyle]" @click="clickHots(x.link)">&nbsp;</view>
-	
-	<!-- <view @click="jumper()">跳转</view> -->
-  </view>
- 
+	<view class="ad-box" :class="{'ad-box-full':ad.list[0].link[0].PageName == 'full'}"
+		:style="{ height: ad.height == 'auto' ? 'auto' : ad.height + 'rpx',padding:marginStyle,backgroundColor:ad.background }">
+		<view class="ad-chi" v-for="(item, index) in adtemp" :key="index" :style="[item.formatStyle]"
+			:class="{'ad-full-height':item.link[0].PageName == 'full'}"
+			@click="clickHandler(item.link[0].new_link_url)">
+			<button open-type="contact" v-if="item.link[0].new_link_url=='contact'"></button>
+			<img :src="item.pic_url" style="margin-bottom:-4px" mode="widthFix" />
+		</view>
+		<view class="hots" v-for="(x, i) in hotspots" :key="i" :style="[x.formatStyle]" @click="clickHots(x.link)">
+			&nbsp;</view>
+	</view>
 </template>
 
 <script>
-export default {
-  props: ["ad"],
-  data() {
-    return {
-      adtemp:[],
-      marginStyle:"",
-      hotspots:[],
-	  showContact:false
-    }
-  },
-  created() {
-	console.log(this.ad)
-    this.ad.list.forEach((x) => {
-      x.formatStyle = {
-        width: x.width,
-        height: x.height,
-        left: x.left,
-        top: x.top,
-        backgroundImage: x.backgroundImage,
-        backgroundRepeat: x.backgroundRepeat,
-        backgroundSize: x.backgroundSize,
-        backgroundPosition: x.backgroundPosition
-      };
-      if (this.ad.height == "auto") {
-        x.formatStyle.position = "unset";
-      }
-      this.marginStyle=`${this.ad.top??0}px ${this.ad.right??0}px ${this.ad.bottom??0}px ${this.ad.left??0}px `
-      this.adtemp.push(x)
-    });
-    this.ad.hotspot.forEach(x=>{
-      x.formatStyle={
-        left:x.left+'rpx',
-        top:x.top+'rpx',
-        height:x.height+'rpx',
-        width:x.width+'rpx'
-      }
-      this.hotspots.push(x)
-    })
-  },
-  methods: {
-	  // 测试跳转
-	  jumper() {
-		  uni.redirectTo({
-		  url: `/pages/webbox/webbox?auth=1`
-		  
-		});
-	  },
-    clickHandler(url) {
-	  if(url=='contact'){
-		return
-	  }else if (url && url.length > 0) {
-        uni.navigateTo({
-          url: url,
-        });
-      }
-    },
-    clickHots(link) {
-      if (link && link.length > 0) {
-        uni.navigateTo({
-          url: link[0].PageUrl,
-        });
-      }
-    },
-  },
-};
+	export default {
+		props: ["ad"],
+		data() {
+			return {
+				adtemp: [],
+				marginStyle: "",
+				hotspots: [],
+				showContact: false
+			}
+		},
+		created() {
+			this.ad.list.forEach((x) => {
+				x.formatStyle = {
+					width: x.width,
+					height: x.height,
+					left: x.left,
+					top: x.top,
+					backgroundImage: x.backgroundImage,
+					backgroundRepeat: x.backgroundRepeat,
+					backgroundSize: x.backgroundSize,
+					backgroundPosition: x.backgroundPosition
+				};
+				if (this.ad.height == "auto") {
+					x.formatStyle.position = "unset";
+				}
+				this.marginStyle =
+					`${this.ad.top??0}px ${this.ad.right??0}px ${this.ad.bottom??0}px ${this.ad.left??0}px `
+				this.adtemp.push(x)
+			});
+			this.ad.hotspot.forEach(x => {
+				x.formatStyle = {
+					left: x.left + 'rpx',
+					top: x.top + 'rpx',
+					height: x.height + 'rpx',
+					width: x.width + 'rpx'
+				}
+				this.hotspots.push(x)
+			})
+		},
+		methods: {
+			// 测试跳转
+			jumper() {
+				uni.redirectTo({
+					url: `/pages/webbox/webbox?auth=1`
+
+				});
+			},
+			clickHandler(url) {
+				if (url == 'contact') {
+					return
+				} else if (url && url.length > 0) {
+					uni.navigateTo({
+						url: url,
+					});
+				}
+			},
+			clickHots(link) {
+				if (link && link.length > 0) {
+					uni.navigateTo({
+						url: link[0].PageUrl,
+					});
+				}
+			},
+		},
+	};
 </script>
 
 <style>
-.ad-box {
-  position: relative;
-  width: 100%;
-}
-.ad-box .hots{
-  position: absolute;
-  z-index: 2;
-}
-.ad-box .ad-chi {
-  position: absolute;
-}
-.ad-box .ad-chi img {
-  width: 100%;
-}
-.ad-box .ad-chi button{
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  opacity: 0;
-  z-index: 2;
-}
-.ad-box-full{
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-}
-.ad-full-height,.ad-full-height image{
-	height: 100% !important;
-}
-</style>
+	.ad-box {
+		position: relative;
+		width: 100%;
+	}
+
+	.ad-box .hots {
+		position: absolute;
+		z-index: 2;
+	}
+
+	.ad-box .ad-chi {
+		position: absolute;
+	}
+
+	.ad-box .ad-chi img {
+		width: 100%;
+	}
+
+	.ad-box .ad-chi button {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		opacity: 0;
+		z-index: 2;
+	}
+
+	.ad-box-full {
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+	}
+
+	.ad-full-height,
+	.ad-full-height image {
+		height: 100% !important;
+	}
+</style>
\ No newline at end of file

components/tabbar/index.vue

@@ -117,22 +117,28 @@
 <template>
 	<view>
 		<view v-if="isShowIcon === 1">
-			<view class="tabbarMain" style="border-radius: 50rpx;" :class="[flagTypeInfo ? 'tabbarMainIphone' : '']" :style="{'position':'fixed','left':'0','right':'0','padding-bottom':paddingBottom + 'rpx'}"
-			 v-if="navs && navs.length > 0">
+			<view class="tabbarMain" style="border-radius: 50rpx;" :class="[flagTypeInfo ? 'tabbarMainIphone' : '']"
+				:style="{'position':'fixed','left':'0','right':'0','padding-bottom':paddingBottom + 'rpx'}"
+				v-if="navs && navs.length > 0">
 				<view class="tabBtnMina" mode="">
 					<view class="itmMain" v-for="(x, i) in navs" :key="i" @click.stop="goUrl(x.url)">
-						<image class="imgse" :fade-show="false" v-if="active != i" mode="heightFix" :src="x.icon"></image>
-						<image class="imgse" :fade-show="false" v-if="active === i" mode="heightFix" :src="x.active_icon"></image>
-						<text class="txtBtn" :style="{ color: active == i ? x.active_color : x.color }">{{ x.text }}</text>
+						<image class="imgse" :fade-show="false" v-if="active != i" mode="heightFix" :src="x.icon">
+						</image>
+						<image class="imgse" :fade-show="false" v-if="active === i" mode="heightFix"
+							:src="x.active_icon"></image>
+						<text class="txtBtn"
+							:style="{ color: active == i ? x.active_color : x.color }">{{ x.text }}</text>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view v-if="isShowIcon === 0">
-			<view class="tabbarMain" :class="[flagTypeInfo ? 'tabbarMainIphone' : '']" :style="{'padding-bottom':'64upx'}" v-if="navs && navs.length > 0">
+			<view class="tabbarMain" :class="[flagTypeInfo ? 'tabbarMainIphone' : '']"
+				:style="{'padding-bottom':'64upx'}" v-if="navs && navs.length > 0">
 				<view class="tabBtnMina" :class="[flagTypeInfo ? 'tabBtnMinaIphone' : '']" mode="">
 					<view class="itmMain" v-for="(x, i) in navs" :key="i" @click.stop="goUrl(x.url)">
-						<text class="txtBtn2" :class="{ activeTxtBtn2: active == i }" :style="{ color: active == i ? x.active_color : x.color }">{{ x.text }}</text>
+						<text class="txtBtn2" :class="{ activeTxtBtn2: active == i }"
+							:style="{ color: active == i ? x.active_color : x.color }">{{ x.text }}</text>
 					</view>
 				</view>
 			</view>
@@ -210,7 +216,6 @@
 					queryString = "?" + queryString.substring(1, queryString.length);
 				}
 				this.crtPath = "/" + t[t.length - 1].route + queryString;
-				console.log(this.crtPath);
 				this.navs.forEach((x, i) => {
 					if (x.url == this.crtPath) {
 						this.active = i;
@@ -219,11 +224,9 @@
 			},
 			goUrl(url) {
 				const replace = uni.getStorageSync('replace_page_index')
-				
-				if(url=='/pages/index/index' && replace && replace.url){
+				if (url == '/pages/index/index' && replace && replace.url) {
 					url = replace.url
 				}
-				console.log(url,replace)
 				if (this.crtPath != url) {
 					uni.redirectTo({
 						url: url,
@@ -236,4 +239,4 @@
 			},
 		},
 	};
-</script>
+</script>
\ No newline at end of file

components/tradeActivity/tradeIndex.vue

@@ -59,9 +59,7 @@
 						</view>
 						<view class="waterfall-item-body">
 							<view class="waterfall-item-name">{{ item.DataName }}</view>
-							<view class="waterfall-item-meta">
-								<text class="waterfall-item-arrow">查看详情 ›</text>
-							</view>
+				 
 						</view>
 					</view>
 				</view>
@@ -85,9 +83,6 @@
 						</view>
 						<view class="waterfall-item-body">
 							<view class="waterfall-item-name">{{ item.DataName }}</view>
-							<view class="waterfall-item-meta">
-								<text class="waterfall-item-arrow">查看详情 ›</text>
-							</view>
 						</view>
 					</view>
 				</view>

pages/index/index.vue

@@ -7,7 +7,8 @@
 				</view>
 			</image>
 		</view>
-		<view v-if="myPageData.home_pages" v-show="showStart == false" :style="[myPageData.home_pages.navs[active].templateBg]">
+		<view v-if="myPageData.home_pages" v-show="showStart == false"
+			:style="[myPageData.home_pages.navs[active].templateBg]">
 			<view class="content" style="min-height: 100vh;" :style="{
           'padding-bottom': showtabs == true ? boxpaddingbottom + 'px' : 0,
           paddingTop: noTitle?o:pagePaddingBottom
@@ -29,16 +30,18 @@
 						<u-icon name="arrow-left" size="44"></u-icon>
 					</view>
 				</view>
-				<u-tabs v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" name="name" :list="myPageData.home_pages.navs"
-				 :is-scroll="true" :active-color="mainColor" :current="active" :bar-width="80" :font-size="32" :bold="false"
-				 @change="changeHandler"></u-tabs>
+				<u-tabs v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" name="name"
+					:list="myPageData.home_pages.navs" :is-scroll="true" :active-color="mainColor" :current="active"
+					:bar-width="80" :font-size="32" :bold="false" @change="changeHandler"></u-tabs>
 				<template v-for="(item, i) in myPageData.home_pages.navs">
 					<view :key="i" v-if="active == i" :class="{'flex-column':noTitle}">
 						<template v-for="(d, di) in item.template.data">
-							<search v-if="d.id == 'search' && isNavPosition == 0" :style-str="d.data" :key="di"></search>
+							<search v-if="d.id == 'search' && isNavPosition == 0" :style-str="d.data" :key="di">
+							</search>
 							<swiper v-if="d.id == 'banner'" :swipers="d.data" :key="di"></swiper>
 							<empty v-if="d.id == 'empty'" :block="d.data" :key="di"></empty>
-							<rubik v-if="d.id == 'rubik'" :ad="d.data" :key="di" :class="{'full-col':d.data.list[0].link[0].PageName == 'full'}"></rubik>
+							<rubik v-if="d.id == 'rubik'" :ad="d.data" :key="di"
+								:class="{'full-col':d.data.list[0].link[0].PageName == 'full'}"></rubik>
 							<goods v-if="d.id == 'goods'" :goods="d.data" :key="di"></goods>
 							<notice v-if="d.id == 'notice'" :notice="d.data" :key="di"></notice>
 							<gridnav v-if="d.id == 'nav'" :navs="d.data" :key="di"></gridnav>
@@ -54,7 +57,8 @@
 							<mapi v-if="d.id == 'map'" :mapi="d.data" :key="di"></mapi>
 							<checkform v-if="d.id == 'form'" :forms="d.data" :key="di"></checkform>
 							<addialog v-if="d.id == 'modal' && d.data.opened" :ads="d.data" :key="di"></addialog>
-							<quicknav v-if="d.id == 'quick-nav' && d.data.navSwitch == 1" :navs="d.data" :key="di"></quicknav>
+							<quicknav v-if="d.id == 'quick-nav' && d.data.navSwitch == 1" :navs="d.data" :key="di">
+							</quicknav>
 							<!-- <pingtuan v-if="d.id == 'pintuan'" :goods="d.data" :key="di"></pingtuan> -->
 							<shopinfo v-if="d.id == 'shop-info'" :ad="d.data" :key="di" ref="son"></shopinfo>
 							<guide v-if="d.id == 'drive-guide'" :info="d.data" ref="city"></guide>
@@ -68,7 +72,8 @@
 							<!-- 线下服务商品 -->
 							<sindex v-if="d.id == 'storeGoods'" :goods="d.data" :key="di"></sindex>
 							<!-- 老师列表 -->
-							<educationteacher v-if="d.id == 'educationteacher'" :goods="d.data" :key="di"></educationteacher>
+							<educationteacher v-if="d.id == 'educationteacher'" :goods="d.data" :key="di">
+							</educationteacher>
 							<!--导航栏-->
 							<navpage v-if="d.id == 'nav-page'" :navs="d.data" :key="di"></navpage>
 							<!-- 相亲的人物模板 -->
@@ -76,47 +81,48 @@
 							<!-- 相亲活动 -->
 							<miaiactivitytype v-if="d.id == 'miaiactivitytype'" :goods="d.data"></miaiactivitytype>
 							<!-- 相亲活动自定义 -->
-							<miaiactivityCustom v-if="d.id == 'miaiactivityCustom'" :goods="d.data"></miaiactivityCustom>
+							<miaiactivityCustom v-if="d.id == 'miaiactivityCustom'" :goods="d.data">
+							</miaiactivityCustom>
 							<!-- 瀑布流组件 -->
 							<Pubu v-if="d.id == 'blindDatePPPlus'" :dataObj="d.data" @refresh="refreshPage"></Pubu>
 							<!-- 首店活动插件 -->
-							<tradeActivity v-if="d.id == 'tradeActivity'" :dataObj="d.data" :pagePaddingBottom="pagePaddingBottom" @refresh="refreshPage"
-							 ref="tradeActive"></tradeActivity>
-							 <!--首店首页数据插件-->
-							<tradeIndex  v-if="d.id == 'tradeIndex'" @refresh="refreshPage"></tradeIndex>
+							<tradeActivity v-if="d.id == 'tradeActivity'" :dataObj="d.data"
+								:pagePaddingBottom="pagePaddingBottom" @refresh="refreshPage" ref="tradeActive">
+							</tradeActivity>
+							<!--首店首页数据插件-->
+							<tradeIndex v-if="d.id == 'tradeIndex'" @refresh="refreshPage"></tradeIndex>
 						</template>
 					</view>
 				</template>
 				<view class="contract_nav" v-if="GetMiniAppId().MallBaseId==5">
-					<button class="Ma_nav-item" show-message-card="true" :send-message-path="currentParent" open-type="contact">
-						<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1644833656000_313.png" />
+					<button class="Ma_nav-item" show-message-card="true" :send-message-path="currentParent"
+						open-type="contact">
+						<img
+							src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1644833656000_313.png" />
 					</button>
 				</view>
 				<view v-if="showtabs == true">
-					<tabbar ></tabbar>
+					<tabbar></tabbar>
 				</view>
-
-				<view class="tips_t" v-if="
-            add_show == 1 &&
-            JSON.stringify(setting) != '{}' &&
-            setting.add_app_text != null
-          "
-				 :style="{
-            'border-radius': setting.add_app_bg_radius + 'rpx',
-            opacity: setting.add_app_bg_transparency / 100,
-            top: pagePaddingBottom,
-          }">
+				<view class="tips_t"
+					v-if="add_show == 1 &&JSON.stringify(setting) != '{}' &&setting.add_app_text != null" :style="{
+					'border-radius': setting.add_app_bg_radius + 'rpx',
+					opacity: setting.add_app_bg_transparency / 100,
+					top: pagePaddingBottom,
+				  }">
 					<u-icon name="cross" color="#fff" @click="close"></u-icon>
 					<view style="width: 1px; height: 20px; margin: 0 10px; background: #fff"></view>
 					<Text style="color: #fff">{{ setting.add_app_text }}</Text>
 					<view class="triangle-up" :style="{ top: pagePaddingBottom }"></view>
 				</view>
-				<coupon v-if="showCoupons" :coupon-message="couponMessage" :cform="ComeFrom" @goLook="goLook" @closeBtn="closeBtn"></coupon>
+				<coupon v-if="showCoupons" :coupon-message="couponMessage" :cform="ComeFrom" @goLook="goLook"
+					@closeBtn="closeBtn"></coupon>
 				<template v-if="setting&&setting.is_show_auth==1">
-						<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
+					<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 				</template>
 				<official-account></official-account>
-				<orderPopup v-if="showorder" :orderPopupdata="orderPopupdata" @gosalesvolume="gosalesvolume" @closeBtn="closeBtn_order"></orderPopup>
+				<orderPopup v-if="showorder" :orderPopupdata="orderPopupdata" @gosalesvolume="gosalesvolume"
+					@closeBtn="closeBtn_order"></orderPopup>
 			</view>
 		</view>
 	</view>
@@ -204,7 +210,7 @@
 				page_idt: 0, //首页组件分享参数
 				boxpaddingbottom: 0, //底部的高度
 				currentParent: '',
-				noTitle:false
+				noTitle: false
 			};
 		},
 		components: {
@@ -358,17 +364,17 @@
 			if (options && options.type) {
 				this.carrierType = options.type;
 			}
-			if (options && options.setnav){
-				let current_url = "/"+this.currentParent+'?'
+			if (options && options.setnav) {
+				let current_url = "/" + this.currentParent + '?'
 				for (let key in options) {
-					current_url += key + '=' + options[key]+'&';
+					current_url += key + '=' + options[key] + '&';
 				}
 				current_url = current_url.slice(0, -1);
 				const replacePageData = {
 					url: current_url,
 					state: options.setnav
 				}
-				uni.setStorageSync("replace_page_index",replacePageData)
+				uni.setStorageSync("replace_page_index", replacePageData)
 			}
 
 			// #ifdef MP-WEIXIN
@@ -458,7 +464,7 @@
 				uni.getStorageSync("add_top_app").add_top_app_show :
 				1;
 			this.setting = set;
-			
+
 			this.isShowBack();
 
 			let now = new Date();
@@ -613,20 +619,20 @@
 			}
 		},
 		methods: {
-			SetMemberBindCustomer(){
+			SetMemberBindCustomer() {
 				let that = this;
 				that.request2({
-					url: "/api/MemberUser/SetMemberBindCustomer",
-					data: {
-						Id: that.u.UserId,
-						CustomerOpenId: uni.getStorageSync('jzTravelOpenId')
-					},
+						url: "/api/MemberUser/SetMemberBindCustomer",
+						data: {
+							Id: that.u.UserId,
+							CustomerOpenId: uni.getStorageSync('jzTravelOpenId')
+						},
 					},
 					(res) => {
-					if (res.resultCode == 1) {
-						uni.removeStorageSync('jzTravelOpenId');
-					}
-					},(err) => {
+						if (res.resultCode == 1) {
+							uni.removeStorageSync('jzTravelOpenId');
+						}
+					}, (err) => {
 						// uni.showToast({
 						// 	title: err.message,
 						// 	icon: "none",
@@ -1108,9 +1114,9 @@
 								res.data.mall.setting.mallStyle.pricecolor;
 						}
 						this.indexPageData = res.data.home_pages.navs[0].template.data;
-						if(!res.data.home_pages.is_show_bottom_nav) {
+						if (!res.data.home_pages.is_show_bottom_nav) {
 							this.showtabs = false;
-						}else {
+						} else {
 							this.showtabs = true;
 						}
 						this.noTitle = res.data.home_pages.is_noshow_title
@@ -1591,15 +1597,17 @@
 		width: 80px;
 		height: 80px;
 	}
-	.content .flex-column{
+
+	.content .flex-column {
 		display: flex;
 		flex-direction: column;
 		width: 100%;
 		min-height: 100vh;
 	}
-	.content .flex-column .full-col{
+
+	.content .flex-column .full-col {
 		flex: 1;
 		height: 1px;
 		position: relative;
 	}
-</style>
+</style>
\ No newline at end of file

pages/kotra/brand/brandComponent.vue

 <template>
-    <u-row gutter="24">
-        <u-col span="6" v-for="(x, i) in g" :key="i">
-          <view
-            class="good_study_two"
-            @click="openGood(x.ID,x.MallBaseId)"
-            :style="{ borderRadius: '20rpx' }"
-          >
-            <view class="img-box">
-              <view class="img-show">
-                <image
-                  style="
+	<u-row gutter="24">
+		<u-col span="6" v-for="(x, i) in g" :key="i">
+			<view class="good_study_two" @click="openGood(x.ID,x.MallBaseId)" :style="{ borderRadius: '20rpx' }">
+				<view class="img-box">
+					<view class="img-show">
+						<image style="
                     width: 100%;
                     height: 100%;
                     border-radius: 20rpx 20rpx 0 0;
-                  "
-                  mode="aspectFill"
-                  :src="x.BannerList[0]"
-                />
-                <!-- <view class="imgNum" v-if="x.AreaRequirement>0||x.EndAreaRequirement>0||x.ShopNum>0">
+                  " mode="aspectFill" :src="x.BannerList[0]" />
+						<!-- <view class="imgNum" v-if="x.AreaRequirement>0||x.EndAreaRequirement>0||x.ShopNum>0">
                   <span class="imgN" style="margin-bottom: 10rpx;"
                   :style="{'text-align':!x.ShopNum||x.ShopNum==''?'right':'left'}">
                     <span v-if="x.AreaRequirement>0||x.EndAreaRequirement>0">
@@ -32,79 +24,81 @@
                     店铺： {{x.ShopNum}}个
                   </span>
                 </view> -->
-              </view>
-            </view>
-            <view class="good-info">
-              <view class="good-name">{{ x.BrandName }}</view>
-              <view class="good-price-info">
-                <span class="price">{{ x.FullBrandName }}</span>
-              </view>
-            </view>
-          </view>
-        </u-col>
-       
-      </u-row>
+					</view>
+				</view>
+				<view class="good-info">
+					<view class="good-name">{{ x.BrandName }}</view>
+					<view class="good-price-info">
+						<span class="price">{{ x.FullBrandName }}</span>
+					</view>
+				</view>
+			</view>
+		</u-col>
+
+	</u-row>
 </template>
 <script>
-    export default {
-        props:['g'],
-        data() {
-            return {
-                u:{},
-                replace: null
-            }
-        },
-        onLoad(options) {
-            
-        },
-        mounted() {
-            let use = uni.getStorageSync("mall_UserInfo")
-            this.u = use
-            this.replace = uni.getStorageSync('replace_page_index')
-        },
-        methods:{
-            openGood(id,MallBaseId) {
-              if(MallBaseId==8){
-                uni.navigateTo({
-                    url: "/pages/kotra/brand/detail?id=" + id,
-                });
-                return
-              }
-                if(this.replace.state=='1'){
-                    uni.navigateTo({
-                        url: "/pages/kotra/brand/detail_brand?id=" + id,
-                    });
-                }else{
+	export default {
+		props: ['g'],
+		data() {
+			return {
+				u: {},
+				replace: null
+			}
+		},
+		onLoad(options) {
+
+		},
+		mounted() {
+			let use = uni.getStorageSync("mall_UserInfo")
+			this.u = use
+			this.replace = uni.getStorageSync('replace_page_index')
+		},
+		methods: {
+			openGood(id, MallBaseId) {
+				if (MallBaseId == 8) {
+					uni.navigateTo({
+						url: "/pages/kotra/brand/detail?id=" + id,
+					});
+					return
+				}
+				if (this.replace.state == '1') {
 					uni.navigateTo({
-                        url: "/pages/kotra/brand/detail_company?id=" + id,
-                    });
-                }
-            }, 
-        }
-    }
+						url: "/pages/kotra/brand/detail_brand?id=" + id,
+					});
+				} else {
+					uni.navigateTo({
+						url: "/pages/kotra/brand/detail_company?id=" + id,
+					});
+				}
+			},
+		}
+	}
 </script>
 <style scoped>
-.img-show{
-  position: relative;
-}
-.imgNum{
-  width: 100%;
-  position: absolute;
-  bottom: 0;
-  padding: 15rpx 27rpx 5rpx 27rpx;
-  z-index: 2;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  color: #fff;
-  font-size: 20rpx;
-  background: rgba(23,23,23,0.4);
-}
-.imgN{
-  flex: 1;
-}
-.imgN:nth-child(2){
-  text-align: right;
-}
+	.img-show {
+		position: relative;
+	}
+
+	.imgNum {
+		width: 100%;
+		position: absolute;
+		bottom: 0;
+		padding: 15rpx 27rpx 5rpx 27rpx;
+		z-index: 2;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		color: #fff;
+		font-size: 20rpx;
+		background: rgba(23, 23, 23, 0.4);
+	}
+
+	.imgN {
+		flex: 1;
+	}
 
+	.imgN:nth-child(2) {
+		text-align: right;
+	}
 </style>
\ No newline at end of file

pages/kotra/brand/detail_brand.vue

@@ -209,8 +209,7 @@
 					"&id=" +
 					this.ID,
 				imageUrl: this.details.BannerList && this.details.BannerList.length > 0 ?
-					this.details.BannerList[0] :
-					"",
+					this.details.BannerList[0] : "",
 			};
 		},
 		onShareAppMessage(res) {
@@ -237,8 +236,7 @@
 				title: this.details.FullBrandName ? this.details.FullBrandName : "",
 				path: "/pages/kotra/brand/detail_brand?id=" + this.ID,
 				imageUrl: this.details.BannerList && this.details.BannerList.length > 0 ?
-					this.details.BannerList[0] :
-					"",
+					this.details.BannerList[0] : "",
 			};
 		},
 		methods: {

pages/kotra/brand/list.vue

@@ -9,7 +9,7 @@
 				:style="{'background': TenantId!=18?`linear-gradient(-3deg, #eff8ff, #c6e6ff)`:''}">
 				<headers :title="replace.state=='1'?'品牌列表':'企业列表'"></headers>
 				<view v-if="TenantId==18" style="padding: 5px 10px">
-					<u-search placeholder="搜索品牌名称" :focus="false" :show-action="false" :clearabled="true" radius="40"
+					<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>
 				</view>
@@ -41,9 +41,6 @@
 								:active-color="mainColor" :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;">
-              <u-icon name="filter-o" color="#111" size="42"></u-icon>
-            </div> -->
 					</view>
 					<view class="brandScreen">
 						<view class="statusBox" v-if="msg.IsInChengdu == 0" @click="changeFirstStoreTest(-1)">
@@ -57,9 +54,11 @@
 						<view v-for="(item, index) in PrizeList" :key="index" class="screenBoxItem"
 							@click="chooseYear(item)">
 							<view class="screenBoxItemYear" :class="{ activeYear: item.Id == msg.PrizeId }">
-								{{ item.YearInfo }}</view>
+								{{ item.YearInfo }}
+							</view>
 							<view class="screenBoxItemName" :class="{ activeName: item.Id == msg.PrizeId }">
-								{{ item.Name }}</view>
+								{{ item.Name }}
+							</view>
 						</view>
 					</view>
 				</template>
@@ -229,7 +228,9 @@
 					"background": "#FFF"
 				},
 				TenantId: null,
-				replace: null,
+				replace: {
+					state: "1", //1-品牌，2-企业服务
+				},
 				secondary: null,
 				GetYBConfig: null,
 				iscpswjselectall: 0,
@@ -298,10 +299,11 @@
 			this.iscpswjselectall = uni.getStorageSync("basedata").iscpswjselectall
 			let uid = uni.getStorageSync("mall_UserInfo")
 			this.TenantId = uid.TenantId
-			// this.msg.TenantId = uid.TenantId
-			this.replace = uni.getStorageSync('replace_page_index')
+			let tempReplace = uni.getStorageSync('replace_page_index')
+			if (tempReplace && tempReplace.state) {
+				this.replace.state = tempReplace.state;
+			}
 			this.msg.BrandEnterpriseType = this.replace.state == '1' ? 1 : 2
-
 			if (options && options.id) {
 				this.msg.BrandClassId = options.id;
 			}
@@ -316,12 +318,9 @@
 			this.GetBrandClassList();
 			this.getPrizeList();
 			// }
-
-
 		},
 		created() {
 			this.mainColor = this.$uiConfig.mainColor;
-
 		},
 		mounted() {
 			uni.setNavigationBarTitle({
@@ -436,8 +435,11 @@
 			init() {
 				let url = "/api/AppletTrade/GetBrandPageList"
 				if (this.TenantId != 18 && this.replace.state) {
-					if (this.replace.state == '1') url = "/api/AppletTrade/GetAllBrandEnterprisePageList"
-					else url = "/api/AppletTrade/GetEnterpriseServicesPageList"
+					if (this.replace.state == '1') {
+						url = "/api/AppletTrade/GetAllBrandEnterprisePageList"
+					} else {
+						url = "/api/AppletTrade/GetEnterpriseServicesPageList"
+					}
 				}
 				this.request2({
 						url: url,
@@ -489,7 +491,6 @@
 				this.g = [];
 				this.init();
 				// }
-
 			},
 			getPrizeList() {
 				this.request2({