Skip to content

M
mallapp
Commit 07d7344f authored by 吴春's avatar 吴春
Browse files
Options

11

parent f6a43580
Show whitespace changes
Inline Side-by-side
Showing with 1634 additions and 1904 deletions
components/rubik/index.vue
View file @ 07d7344f
<template> <template>
<view <view class="ad-box" :class="{'ad-box-full':ad.list[0].link[0].PageName == 'full'}"
class="ad-box" :style="{ height: ad.height == 'auto' ? 'auto' : ad.height + 'rpx',padding:marginStyle,backgroundColor:ad.background }">
:class="{'ad-box-full':ad.list[0].link[0].PageName == 'full'}" <view class="ad-chi" v-for="(item, index) in adtemp" :key="index" :style="[item.formatStyle]"
: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'}" :class="{'ad-full-height':item.link[0].PageName == 'full'}"
@click="clickHandler(item.link[0].new_link_url)" @click="clickHandler(item.link[0].new_link_url)">
>
<button open-type="contact" v-if="item.link[0].new_link_url=='contact'"></button> <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"/> <img :src="item.pic_url" style="margin-bottom:-4px" mode="widthFix" />
</view> </view>
<view class="hots" v-for="(x, i) in hotspots" :key="i" :style="[x.formatStyle]" @click="clickHots(x.link)">&nbsp;</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>
</template> </template>
<script> <script>
export default { export default {
props: ["ad"], props: ["ad"],
data() { data() {
return { return {
adtemp:[], adtemp: [],
marginStyle:"", marginStyle: "",
hotspots:[], hotspots: [],
showContact:false showContact: false
} }
}, },
created() { created() {
console.log(this.ad)
this.ad.list.forEach((x) => { this.ad.list.forEach((x) => {
x.formatStyle = { x.formatStyle = {
width: x.width, width: x.width,
...@@ -49,15 +38,16 @@ export default { ...@@ -49,15 +38,16 @@ export default {
if (this.ad.height == "auto") { if (this.ad.height == "auto") {
x.formatStyle.position = "unset"; 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.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.adtemp.push(x)
}); });
this.ad.hotspot.forEach(x=>{ this.ad.hotspot.forEach(x => {
x.formatStyle={ x.formatStyle = {
left:x.left+'rpx', left: x.left + 'rpx',
top:x.top+'rpx', top: x.top + 'rpx',
height:x.height+'rpx', height: x.height + 'rpx',
width:x.width+'rpx' width: x.width + 'rpx'
} }
this.hotspots.push(x) this.hotspots.push(x)
}) })
...@@ -71,9 +61,9 @@ export default { ...@@ -71,9 +61,9 @@ export default {
}); });
}, },
clickHandler(url) { clickHandler(url) {
if(url=='contact'){ if (url == 'contact') {
return return
}else if (url && url.length > 0) { } else if (url && url.length > 0) {
uni.navigateTo({ uni.navigateTo({
url: url, url: url,
}); });
...@@ -87,39 +77,46 @@ export default { ...@@ -87,39 +77,46 @@ export default {
} }
}, },
}, },
}; };
</script> </script>
<style> <style>
.ad-box { .ad-box {
position: relative; position: relative;
width: 100%; width: 100%;
} }
.ad-box .hots{
.ad-box .hots {
position: absolute; position: absolute;
z-index: 2; z-index: 2;
} }
.ad-box .ad-chi {
.ad-box .ad-chi {
position: absolute; position: absolute;
} }
.ad-box .ad-chi img {
.ad-box .ad-chi img {
width: 100%; width: 100%;
} }
.ad-box .ad-chi button{
.ad-box .ad-chi button {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%; height: 100%;
opacity: 0; opacity: 0;
z-index: 2; z-index: 2;
} }
.ad-box-full{
.ad-box-full {
position: absolute; position: absolute;
top: 0; top: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; right: 0;
} }
.ad-full-height,.ad-full-height image{
.ad-full-height,
.ad-full-height image {
height: 100% !important; height: 100% !important;
} }
</style> </style>
\ No newline at end of file
components/tabbar/index.vue
View file @ 07d7344f
...@@ -117,22 +117,28 @@ ...@@ -117,22 +117,28 @@
<template> <template>
<view> <view>
<view v-if="isShowIcon === 1"> <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'}" <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"> v-if="navs && navs.length > 0">
<view class="tabBtnMina" mode=""> <view class="tabBtnMina" mode="">
<view class="itmMain" v-for="(x, i) in navs" :key="i" @click.stop="goUrl(x.url)"> <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.icon">
<image class="imgse" :fade-show="false" v-if="active === i" mode="heightFix" :src="x.active_icon"></image> </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.active_icon"></image>
<text class="txtBtn"
:style="{ color: active == i ? x.active_color : x.color }">{{ x.text }}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view v-if="isShowIcon === 0"> <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="tabBtnMina" :class="[flagTypeInfo ? 'tabBtnMinaIphone' : '']" mode="">
<view class="itmMain" v-for="(x, i) in navs" :key="i" @click.stop="goUrl(x.url)"> <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> </view>
</view> </view>
...@@ -210,7 +216,6 @@ ...@@ -210,7 +216,6 @@
queryString = "?" + queryString.substring(1, queryString.length); queryString = "?" + queryString.substring(1, queryString.length);
} }
this.crtPath = "/" + t[t.length - 1].route + queryString; this.crtPath = "/" + t[t.length - 1].route + queryString;
console.log(this.crtPath);
this.navs.forEach((x, i) => { this.navs.forEach((x, i) => {
if (x.url == this.crtPath) { if (x.url == this.crtPath) {
this.active = i; this.active = i;
...@@ -219,11 +224,9 @@ ...@@ -219,11 +224,9 @@
}, },
goUrl(url) { goUrl(url) {
const replace = uni.getStorageSync('replace_page_index') 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 url = replace.url
} }
console.log(url,replace)
if (this.crtPath != url) { if (this.crtPath != url) {
uni.redirectTo({ uni.redirectTo({
url: url, url: url,
......
components/tradeActivity/tradeIndex.vue
View file @ 07d7344f
...@@ -59,9 +59,7 @@ ...@@ -59,9 +59,7 @@
</view> </view>
<view class="waterfall-item-body"> <view class="waterfall-item-body">
<view class="waterfall-item-name">{{ item.DataName }}</view> <view class="waterfall-item-name">{{ item.DataName }}</view>
<view class="waterfall-item-meta">
<text class="waterfall-item-arrow">查看详情 ›</text>
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -85,9 +83,6 @@ ...@@ -85,9 +83,6 @@
</view> </view>
<view class="waterfall-item-body"> <view class="waterfall-item-body">
<view class="waterfall-item-name">{{ item.DataName }}</view> <view class="waterfall-item-name">{{ item.DataName }}</view>
<view class="waterfall-item-meta">
<text class="waterfall-item-arrow">查看详情 ›</text>
</view>
</view> </view>
</view> </view>
</view> </view>
......
pages/index/index.vue
View file @ 07d7344f
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
</view> </view>
</image> </image>
</view> </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="{ <view class="content" style="min-height: 100vh;" :style="{
'padding-bottom': showtabs == true ? boxpaddingbottom + 'px' : 0, 'padding-bottom': showtabs == true ? boxpaddingbottom + 'px' : 0,
paddingTop: noTitle?o:pagePaddingBottom paddingTop: noTitle?o:pagePaddingBottom
...@@ -29,16 +30,18 @@ ...@@ -29,16 +30,18 @@
<u-icon name="arrow-left" size="44"></u-icon> <u-icon name="arrow-left" size="44"></u-icon>
</view> </view>
</view> </view>
<u-tabs v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" name="name" :list="myPageData.home_pages.navs" <u-tabs v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" name="name"
:is-scroll="true" :active-color="mainColor" :current="active" :bar-width="80" :font-size="32" :bold="false" :list="myPageData.home_pages.navs" :is-scroll="true" :active-color="mainColor" :current="active"
@change="changeHandler"></u-tabs> :bar-width="80" :font-size="32" :bold="false" @change="changeHandler"></u-tabs>
<template v-for="(item, i) in myPageData.home_pages.navs"> <template v-for="(item, i) in myPageData.home_pages.navs">
<view :key="i" v-if="active == i" :class="{'flex-column':noTitle}"> <view :key="i" v-if="active == i" :class="{'flex-column':noTitle}">
<template v-for="(d, di) in item.template.data"> <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> <swiper v-if="d.id == 'banner'" :swipers="d.data" :key="di"></swiper>
<empty v-if="d.id == 'empty'" :block="d.data" :key="di"></empty> <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> <goods v-if="d.id == 'goods'" :goods="d.data" :key="di"></goods>
<notice v-if="d.id == 'notice'" :notice="d.data" :key="di"></notice> <notice v-if="d.id == 'notice'" :notice="d.data" :key="di"></notice>
<gridnav v-if="d.id == 'nav'" :navs="d.data" :key="di"></gridnav> <gridnav v-if="d.id == 'nav'" :navs="d.data" :key="di"></gridnav>
...@@ -54,7 +57,8 @@ ...@@ -54,7 +57,8 @@
<mapi v-if="d.id == 'map'" :mapi="d.data" :key="di"></mapi> <mapi v-if="d.id == 'map'" :mapi="d.data" :key="di"></mapi>
<checkform v-if="d.id == 'form'" :forms="d.data" :key="di"></checkform> <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> <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> --> <!-- <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> <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> <guide v-if="d.id == 'drive-guide'" :info="d.data" ref="city"></guide>
...@@ -68,7 +72,8 @@ ...@@ -68,7 +72,8 @@
<!-- 线下服务商品 --> <!-- 线下服务商品 -->
<sindex v-if="d.id == 'storeGoods'" :goods="d.data" :key="di"></sindex> <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> <navpage v-if="d.id == 'nav-page'" :navs="d.data" :key="di"></navpage>
<!-- 相亲的人物模板 --> <!-- 相亲的人物模板 -->
...@@ -76,32 +81,31 @@ ...@@ -76,32 +81,31 @@
<!-- 相亲活动 --> <!-- 相亲活动 -->
<miaiactivitytype v-if="d.id == 'miaiactivitytype'" :goods="d.data"></miaiactivitytype> <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> <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" <tradeActivity v-if="d.id == 'tradeActivity'" :dataObj="d.data"
ref="tradeActive"></tradeActivity> :pagePaddingBottom="pagePaddingBottom" @refresh="refreshPage" ref="tradeActive">
</tradeActivity>
<!--首店首页数据插件--> <!--首店首页数据插件-->
<tradeIndex v-if="d.id == 'tradeIndex'" @refresh="refreshPage"></tradeIndex> <tradeIndex v-if="d.id == 'tradeIndex'" @refresh="refreshPage"></tradeIndex>
</template> </template>
</view> </view>
</template> </template>
<view class="contract_nav" v-if="GetMiniAppId().MallBaseId==5"> <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"> <button class="Ma_nav-item" show-message-card="true" :send-message-path="currentParent"
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1644833656000_313.png" /> open-type="contact">
<img
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1644833656000_313.png" />
</button> </button>
</view> </view>
<view v-if="showtabs == true"> <view v-if="showtabs == true">
<tabbar ></tabbar> <tabbar></tabbar>
</view> </view>
<view class="tips_t"
<view class="tips_t" v-if=" v-if="add_show == 1 &&JSON.stringify(setting) != '{}' &&setting.add_app_text != null" :style="{
add_show == 1 &&
JSON.stringify(setting) != '{}' &&
setting.add_app_text != null
"
:style="{
'border-radius': setting.add_app_bg_radius + 'rpx', 'border-radius': setting.add_app_bg_radius + 'rpx',
opacity: setting.add_app_bg_transparency / 100, opacity: setting.add_app_bg_transparency / 100,
top: pagePaddingBottom, top: pagePaddingBottom,
...@@ -111,12 +115,14 @@ ...@@ -111,12 +115,14 @@
<Text style="color: #fff">{{ setting.add_app_text }}</Text> <Text style="color: #fff">{{ setting.add_app_text }}</Text>
<view class="triangle-up" :style="{ top: pagePaddingBottom }"></view> <view class="triangle-up" :style="{ top: pagePaddingBottom }"></view>
</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"> <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> </template>
<official-account></official-account> <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> </view>
</view> </view>
...@@ -204,7 +210,7 @@ ...@@ -204,7 +210,7 @@
page_idt: 0, //首页组件分享参数 page_idt: 0, //首页组件分享参数
boxpaddingbottom: 0, //底部的高度 boxpaddingbottom: 0, //底部的高度
currentParent: '', currentParent: '',
noTitle:false noTitle: false
}; };
}, },
components: { components: {
...@@ -358,17 +364,17 @@ ...@@ -358,17 +364,17 @@
if (options && options.type) { if (options && options.type) {
this.carrierType = options.type; this.carrierType = options.type;
} }
if (options && options.setnav){ if (options && options.setnav) {
let current_url = "/"+this.currentParent+'?' let current_url = "/" + this.currentParent + '?'
for (let key in options) { for (let key in options) {
current_url += key + '=' + options[key]+'&'; current_url += key + '=' + options[key] + '&';
} }
current_url = current_url.slice(0, -1); current_url = current_url.slice(0, -1);
const replacePageData = { const replacePageData = {
url: current_url, url: current_url,
state: options.setnav state: options.setnav
} }
uni.setStorageSync("replace_page_index",replacePageData) uni.setStorageSync("replace_page_index", replacePageData)
} }
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
...@@ -613,7 +619,7 @@ ...@@ -613,7 +619,7 @@
} }
}, },
methods: { methods: {
SetMemberBindCustomer(){ SetMemberBindCustomer() {
let that = this; let that = this;
that.request2({ that.request2({
url: "/api/MemberUser/SetMemberBindCustomer", url: "/api/MemberUser/SetMemberBindCustomer",
...@@ -626,7 +632,7 @@ ...@@ -626,7 +632,7 @@
if (res.resultCode == 1) { if (res.resultCode == 1) {
uni.removeStorageSync('jzTravelOpenId'); uni.removeStorageSync('jzTravelOpenId');
} }
},(err) => { }, (err) => {
// uni.showToast({ // uni.showToast({
// title: err.message, // title: err.message,
// icon: "none", // icon: "none",
...@@ -1108,9 +1114,9 @@ ...@@ -1108,9 +1114,9 @@
res.data.mall.setting.mallStyle.pricecolor; res.data.mall.setting.mallStyle.pricecolor;
} }
this.indexPageData = res.data.home_pages.navs[0].template.data; 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; this.showtabs = false;
}else { } else {
this.showtabs = true; this.showtabs = true;
} }
this.noTitle = res.data.home_pages.is_noshow_title this.noTitle = res.data.home_pages.is_noshow_title
...@@ -1591,13 +1597,15 @@ ...@@ -1591,13 +1597,15 @@
width: 80px; width: 80px;
height: 80px; height: 80px;
} }
.content .flex-column{
.content .flex-column {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
min-height: 100vh; min-height: 100vh;
} }
.content .flex-column .full-col{
.content .flex-column .full-col {
flex: 1; flex: 1;
height: 1px; height: 1px;
position: relative; position: relative;
......
pages/kotra/brand/brandComponent.vue
View file @ 07d7344f
<template> <template>
<u-row gutter="24"> <u-row gutter="24">
<u-col span="6" v-for="(x, i) in g" :key="i"> <u-col span="6" v-for="(x, i) in g" :key="i">
<view <view class="good_study_two" @click="openGood(x.ID,x.MallBaseId)" :style="{ borderRadius: '20rpx' }">
class="good_study_two"
@click="openGood(x.ID,x.MallBaseId)"
:style="{ borderRadius: '20rpx' }"
>
<view class="img-box"> <view class="img-box">
<view class="img-show"> <view class="img-show">
<image <image style="
style="
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 20rpx 20rpx 0 0; border-radius: 20rpx 20rpx 0 0;
" " mode="aspectFill" :src="x.BannerList[0]" />
mode="aspectFill"
:src="x.BannerList[0]"
/>
<!-- <view class="imgNum" v-if="x.AreaRequirement>0||x.EndAreaRequirement>0||x.ShopNum>0"> <!-- <view class="imgNum" v-if="x.AreaRequirement>0||x.EndAreaRequirement>0||x.ShopNum>0">
<span class="imgN" style="margin-bottom: 10rpx;" <span class="imgN" style="margin-bottom: 10rpx;"
:style="{'text-align':!x.ShopNum||x.ShopNum==''?'right':'left'}"> :style="{'text-align':!x.ShopNum||x.ShopNum==''?'right':'left'}">
...@@ -47,10 +39,10 @@ ...@@ -47,10 +39,10 @@
</template> </template>
<script> <script>
export default { export default {
props:['g'], props: ['g'],
data() { data() {
return { return {
u:{}, u: {},
replace: null replace: null
} }
}, },
...@@ -62,19 +54,19 @@ ...@@ -62,19 +54,19 @@
this.u = use this.u = use
this.replace = uni.getStorageSync('replace_page_index') this.replace = uni.getStorageSync('replace_page_index')
}, },
methods:{ methods: {
openGood(id,MallBaseId) { openGood(id, MallBaseId) {
if(MallBaseId==8){ if (MallBaseId == 8) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/kotra/brand/detail?id=" + id, url: "/pages/kotra/brand/detail?id=" + id,
}); });
return return
} }
if(this.replace.state=='1'){ if (this.replace.state == '1') {
uni.navigateTo({ uni.navigateTo({
url: "/pages/kotra/brand/detail_brand?id=" + id, url: "/pages/kotra/brand/detail_brand?id=" + id,
}); });
}else{ } else {
uni.navigateTo({ uni.navigateTo({
url: "/pages/kotra/brand/detail_company?id=" + id, url: "/pages/kotra/brand/detail_company?id=" + id,
}); });
...@@ -84,10 +76,11 @@ ...@@ -84,10 +76,11 @@
} }
</script> </script>
<style scoped> <style scoped>
.img-show{ .img-show {
position: relative; position: relative;
} }
.imgNum{
.imgNum {
width: 100%; width: 100%;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
...@@ -98,13 +91,14 @@ ...@@ -98,13 +91,14 @@
justify-content: space-between; justify-content: space-between;
color: #fff; color: #fff;
font-size: 20rpx; font-size: 20rpx;
background: rgba(23,23,23,0.4); background: rgba(23, 23, 23, 0.4);
} }
.imgN{
.imgN {
flex: 1; flex: 1;
} }
.imgN:nth-child(2){
text-align: right;
}
.imgN:nth-child(2) {
text-align: right;
}
</style> </style>
\ No newline at end of file
pages/kotra/brand/detail_brand.vue
View file @ 07d7344f
...@@ -209,8 +209,7 @@ ...@@ -209,8 +209,7 @@
"&id=" + "&id=" +
this.ID, this.ID,
imageUrl: this.details.BannerList && this.details.BannerList.length > 0 ? imageUrl: this.details.BannerList && this.details.BannerList.length > 0 ?
this.details.BannerList[0] : this.details.BannerList[0] : "",
"",
}; };
}, },
onShareAppMessage(res) { onShareAppMessage(res) {
...@@ -237,8 +236,7 @@ ...@@ -237,8 +236,7 @@
title: this.details.FullBrandName ? this.details.FullBrandName : "", title: this.details.FullBrandName ? this.details.FullBrandName : "",
path: "/pages/kotra/brand/detail_brand?id=" + this.ID, path: "/pages/kotra/brand/detail_brand?id=" + this.ID,
imageUrl: this.details.BannerList && this.details.BannerList.length > 0 ? imageUrl: this.details.BannerList && this.details.BannerList.length > 0 ?
this.details.BannerList[0] : this.details.BannerList[0] : "",
"",
}; };
}, },
methods: { methods: {
......
pages/kotra/brand/detail_new.vue
View file @ 07d7344f
<template> <template>
<view <view style="
style="
height: 100vh; height: 100vh;
overflow: hidden; overflow: hidden;
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
" ">
>
<scroll-view scroll-y="true" style="height: 100%" @scroll="scroll"> <scroll-view scroll-y="true" style="height: 100%" @scroll="scroll">
<view class="bg-red"> <view class="bg-red">
<view class="detail-box"> <view class="detail-box">
...@@ -15,32 +13,20 @@ ...@@ -15,32 +13,20 @@
{{ details.BrandName }}1 {{ details.BrandName }}1
</view> </view>
<view class="tag-box"> <view class="tag-box">
<text class="tag1">{{ details.BrandType }}</text <text class="tag1">{{ details.BrandType }}</text><text
><text class="tag2">{{ details.CustomerType }}</text> class="tag2">{{ details.CustomerType }}</text>
</view> </view>
</view> </view>
<view class="score-box flex item-center"> <view class="score-box flex item-center">
<u-rate <u-rate :current="rate" :count="5" :size="25" active-icon="star" active-color="#F30329"
:current="rate" inactive-color="#b2b2b2" class="rate"></u-rate>
:count="5"
:size="25"
active-icon="star"
active-color="#F30329"
inactive-color="#b2b2b2"
class="rate"
></u-rate>
<text class="score">4.9分</text> <text class="score">4.9分</text>
<text class="desire">开店意愿</text> <text class="desire">开店意愿</text>
</view> </view>
<view class="img-box"> <view class="img-box">
<view v-for="(src, index) in details.BannerList" :key="index"> <view v-for="(src, index) in details.BannerList" :key="index">
<image <image :src="src" class="img" mode="aspectFill" @click="previewImage(index)"></image>
:src="src"
class="img"
mode="aspectFill"
@click="previewImage(index)"
></image>
</view> </view>
</view> </view>
<view class="info1 flex flex-between"> <view class="info1 flex flex-between">
...@@ -96,228 +82,102 @@ ...@@ -96,228 +82,102 @@
</view> </view>
</view> </view>
<view class="brand-title"> <view class="brand-title">
<image <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/kotra-tzxq.png"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/kotra-tzxq.png" mode="widthFix"></image>
mode="widthFix"
></image>
</view> </view>
<view style="margin-top: 30rpx" v-if="details.Advertising != ''"> <view style="margin-top: 30rpx" v-if="details.Advertising != ''">
<h-parse <h-parse :content="details.Advertising" @navigate="clickDescription"></h-parse>
:content="details.Advertising"
@navigate="clickDescription"
></h-parse>
</view> </view>
<view style="margin-top: 30rpx" v-if="details.Advertising == ''"> <view style="margin-top: 30rpx" v-if="details.Advertising == ''">
无 无
</view> </view>
<view class="brand-title"> <view class="brand-title">
<image <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/kotra-wyxq.png"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/kotra-wyxq.png" mode="widthFix"></image>
mode="widthFix"
></image>
</view> </view>
<view class="Listbox"> <view class="Listbox">
<view <view id="kiakou" class="Listbox-item"
id="kiakou" @click="showTips('kiakou', details.ShopSize, details.IsShopSize)">
class="Listbox-item" <image :src="EquityList[8].ImagePath" v-if="details.IsShopSize == 1" mode="widthFix">
@click="showTips('kiakou', details.ShopSize, details.IsShopSize)" </image>
> <image :src="EquityList[8].Image_n" v-else mode="widthFix"></image>
<image <text class="list-item-text" :style="{
:src="EquityList[8].ImagePath"
v-if="details.IsShopSize == 1"
mode="widthFix"
></image>
<image
:src="EquityList[8].Image_n"
v-else
mode="widthFix"
></image>
<text
class="list-item-text"
:style="{
color: details.IsShopSize == 1 ? '#424242' : '#D6D6D6', color: details.IsShopSize == 1 ? '#424242' : '#D6D6D6',
}" }">{{ EquityList[8].Title }}</text>
>{{ EquityList[8].Title }}</text
>
</view> </view>
<view class="Listbox-item"> <view class="Listbox-item">
<image <image :src="EquityList[0].ImagePath" v-if="details.Plumbing == 1" mode="widthFix"></image>
:src="EquityList[0].ImagePath" <image :src="EquityList[0].Image_n" v-else mode="widthFix"></image>
v-if="details.Plumbing == 1" <text class="list-item-text" :style="{
mode="widthFix"
></image>
<image
:src="EquityList[0].Image_n"
v-else
mode="widthFix"
></image>
<text
class="list-item-text"
:style="{
color: details.Plumbing == 1 ? '#424242' : '#D6D6D6', color: details.Plumbing == 1 ? '#424242' : '#D6D6D6',
}" }">{{ EquityList[0].Title }}</text>
>{{ EquityList[0].Title }}</text
>
</view> </view>
<view class="Listbox-item"> <view class="Listbox-item">
<image <image :src="EquityList[7].ImagePath" v-if="details.Caliber == 1" mode="widthFix"></image>
:src="EquityList[7].ImagePath" <image :src="EquityList[7].Image_n" v-else mode="widthFix"></image>
v-if="details.Caliber == 1" <text class="list-item-text"
mode="widthFix" :style="{ color: details.Caliber == 1 ? '#424242' : '#D6D6D6' }">{{ EquityList[7].Title }}</text>
></image>
<image
:src="EquityList[7].Image_n"
v-else
mode="widthFix"
></image>
<text
class="list-item-text"
:style="{ color: details.Caliber == 1 ? '#424242' : '#D6D6D6' }"
>{{ EquityList[7].Title }}</text
>
</view> </view>
<view class="Listbox-item"> <view class="Listbox-item">
<image <image :src="EquityList[1].ImagePath" v-if="details.Sewage == 1" mode="widthFix"></image>
:src="EquityList[1].ImagePath" <image :src="EquityList[1].Image_n" v-else mode="widthFix"></image>
v-if="details.Sewage == 1" <text class="list-item-text"
mode="widthFix" :style="{ color: details.Sewage == 1 ? '#424242' : '#D6D6D6' }">{{ EquityList[1].Title }}</text>
></image>
<image
:src="EquityList[1].Image_n"
v-else
mode="widthFix"
></image>
<text
class="list-item-text"
:style="{ color: details.Sewage == 1 ? '#424242' : '#D6D6D6' }"
>{{ EquityList[1].Title }}</text
>
</view> </view>
<!-- 燃气 --> <!-- 燃气 -->
<view <view class="Listbox-item" id="ranqi"
class="Listbox-item" @click="showTips('ranqi', details.RanQiBZ, details.RanQi)">
id="ranqi" <image :src="EquityList[2].ImagePath" v-if="details.RanQi == 1" mode="widthFix"></image>
@click="showTips('ranqi', details.RanQiBZ, details.RanQi)" <image :src="EquityList[2].Image_n" v-else mode="widthFix"></image>
> <text class="list-item-text"
<image :style="{ color: details.RanQi == 1 ? '#424242' : '#D6D6D6' }">{{ EquityList[2].Title }}</text>
:src="EquityList[2].ImagePath" </view>
v-if="details.RanQi == 1" <view class="Listbox-item" id="dianliang" @click="
mode="widthFix"
></image>
<image
:src="EquityList[2].Image_n"
v-else
mode="widthFix"
></image>
<text
class="list-item-text"
:style="{ color: details.RanQi == 1 ? '#424242' : '#D6D6D6' }"
>{{ EquityList[2].Title }}</text
>
</view>
<view
class="Listbox-item"
id="dianliang"
@click="
showTips('dianliang', details.DianLiang, details.IsDianLiang) showTips('dianliang', details.DianLiang, details.IsDianLiang)
" ">
> <image :src="EquityList[3].ImagePath" v-if="details.IsDianLiang == 1" mode="widthFix">
<image </image>
:src="EquityList[3].ImagePath" <image :src="EquityList[3].Image_n" v-else mode="widthFix"></image>
v-if="details.IsDianLiang == 1" <text class="list-item-text" :style="{
mode="widthFix"
></image>
<image
:src="EquityList[3].Image_n"
v-else
mode="widthFix"
></image>
<text
class="list-item-text"
:style="{
color: details.IsDianLiang == 1 ? '#424242' : '#D6D6D6', color: details.IsDianLiang == 1 ? '#424242' : '#D6D6D6',
}" }">{{ EquityList[3].Title }}</text>
>{{ EquityList[3].Title }}</text </view>
>
</view> <view class="Listbox-item" id="paiyan"
@click="showTips('paiyan', details.PaiYanBZ, details.PaiYan)">
<view <image :src="EquityList[5].ImagePath" v-if="details.PaiYan == 1" mode="widthFix"></image>
class="Listbox-item" <image :src="EquityList[5].Image_n" v-else mode="widthFix"></image>
id="paiyan" <text class="list-item-text"
@click="showTips('paiyan', details.PaiYanBZ, details.PaiYan)" :style="{ color: details.PaiYan == 1 ? '#424242' : '#D6D6D6' }">{{ EquityList[5].Title }}</text>
>
<image
:src="EquityList[5].ImagePath"
v-if="details.PaiYan == 1"
mode="widthFix"
></image>
<image
:src="EquityList[5].Image_n"
v-else
mode="widthFix"
></image>
<text
class="list-item-text"
:style="{ color: details.PaiYan == 1 ? '#424242' : '#D6D6D6' }"
>{{ EquityList[5].Title }}</text
>
</view> </view>
<view class="Listbox-item"> <view class="Listbox-item">
<image <image :src="EquityList[6].ImagePath" v-if="details.KongTiao == 1" mode="widthFix"></image>
:src="EquityList[6].ImagePath" <image :src="EquityList[6].Image_n" v-else mode="widthFix"></image>
v-if="details.KongTiao == 1" <text class="list-item-text" :style="{
mode="widthFix"
></image>
<image
:src="EquityList[6].Image_n"
v-else
mode="widthFix"
></image>
<text
class="list-item-text"
:style="{
color: details.KongTiao == 1 ? '#424242' : '#D6D6D6', color: details.KongTiao == 1 ? '#424242' : '#D6D6D6',
}" }">{{ EquityList[6].Title }}</text>
>{{ EquityList[6].Title }}</text
>
</view> </view>
<view class="Listbox-item"> <view class="Listbox-item">
<image <image :src="EquityList[4].ImagePath" v-if="details.XinFeng == 1" mode="widthFix"></image>
:src="EquityList[4].ImagePath" <image :src="EquityList[4].Image_n" v-else mode="widthFix"></image>
v-if="details.XinFeng == 1" <text class="list-item-text"
mode="widthFix" :style="{ color: details.XinFeng == 1 ? '#424242' : '#D6D6D6' }">{{ EquityList[4].Title }}</text>
></image>
<image
:src="EquityList[4].Image_n"
v-else
mode="widthFix"
></image>
<text
class="list-item-text"
:style="{ color: details.XinFeng == 1 ? '#424242' : '#D6D6D6' }"
>{{ EquityList[4].Title }}</text
>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<bianmarenTooltip <bianmarenTooltip :gravity="gravity" :tooltipShow="tooltipShow" :btns="tooltipBtns" :eleId="eleId">
:gravity="gravity"
:tooltipShow="tooltipShow"
:btns="tooltipBtns"
:eleId="eleId"
>
</bianmarenTooltip> </bianmarenTooltip>
</view> </view>
</template> </template>
<script> <script>
import hParse from "@/components/u-parse/parse.vue"; import hParse from "@/components/u-parse/parse.vue";
import bianmarenTooltip from "../components/bianmaren-tooltips.vue"; import bianmarenTooltip from "../components/bianmaren-tooltips.vue";
let timer; let timer;
export default { export default {
components: { components: {
hParse, hParse,
bianmarenTooltip, bianmarenTooltip,
...@@ -327,8 +187,7 @@ export default { ...@@ -327,8 +187,7 @@ export default {
rate: 1, rate: 1,
ID: 0, ID: 0,
details: {}, details: {},
typeList: [ typeList: [{
{
Id: 0, Id: 0,
Name: "视频", Name: "视频",
}, },
...@@ -343,69 +202,50 @@ export default { ...@@ -343,69 +202,50 @@ export default {
active: 0, active: 0,
mainColor: "", mainColor: "",
controls: false, //显示默认控件 controls: false, //显示默认控件
EquityList: [ EquityList: [{
{
Title: "上下水", Title: "上下水",
ImagePath: ImagePath: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-sxs.png",
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-sxs.png", Image_n: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-sxs-n.png",
Image_n:
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-sxs-n.png",
}, },
{ {
Title: "排污", Title: "排污",
ImagePath: ImagePath: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-pw.png",
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-pw.png", Image_n: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-pw-n.png",
Image_n:
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-pw-n.png",
}, },
{ {
Title: "燃气", Title: "燃气",
ImagePath: ImagePath: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-rh.png",
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-rh.png", Image_n: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-rh-n.png",
Image_n:
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-rh-n.png",
}, },
{ {
Title: "电量负荷", Title: "电量负荷",
ImagePath: ImagePath: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-dl.png",
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-dl.png", Image_n: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-dl-n.png",
Image_n:
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-dl-n.png",
}, },
{ {
Title: "新风", Title: "新风",
ImagePath: ImagePath: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-xf.png",
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-xf.png", Image_n: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-xf-n.png",
Image_n:
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-xf-n.png",
}, },
{ {
Title: "排烟量", Title: "排烟量",
ImagePath: ImagePath: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-pyl.png",
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-pyl.png", Image_n: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-pyl-n.png",
Image_n:
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-pyl-n.png",
}, },
{ {
Title: "空调", Title: "空调",
ImagePath: ImagePath: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-kt.png",
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-kt.png", Image_n: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-kt-n.png",
Image_n:
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-kt-n.png",
}, },
{ {
Title: "管径", Title: "管径",
ImagePath: ImagePath: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-gj.png",
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-gj.png", Image_n: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-gj-n.png",
Image_n:
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-gj-n.png",
}, },
{ {
Title: "开口尺寸", Title: "开口尺寸",
ImagePath: ImagePath: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-kkcc.png",
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-kkcc.png", Image_n: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-kkcc-n.png",
Image_n:
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-kkcc-n.png",
}, },
], ],
gravity: "top", gravity: "top",
...@@ -445,28 +285,27 @@ export default { ...@@ -445,28 +285,27 @@ export default {
}, },
onShareTimeline() { onShareTimeline() {
//朋友圈 //朋友圈
let uid = uni.getStorageSync("mall_UserInfo") let uid = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserId uni.getStorageSync("mall_UserInfo").UserId :
: 0; 0;
if (uid == 0) { if (uid == 0) {
uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0; uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
} }
let SmallShopId = uni.getStorageSync("mall_UserInfo") let SmallShopId = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").SmallShopId uni.getStorageSync("mall_UserInfo").SmallShopId :
: 0; 0;
if (SmallShopId == 0) { if (SmallShopId == 0) {
//如果微店id为0 去找所属微店id //如果微店id为0 去找所属微店id
SmallShopId = uni.getStorageSync("mall_UserInfo") SmallShopId = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserSmallShopId uni.getStorageSync("mall_UserInfo").UserSmallShopId :
: 0; 0;
} }
let Up = uni.getStorageSync("mall_UserInfo") let Up = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserPageType uni.getStorageSync("mall_UserInfo").UserPageType :
: 0; 0;
return { return {
title: this.details.FullBrandName ? this.details.FullBrandName : "", title: this.details.FullBrandName ? this.details.FullBrandName : "",
query: query: "user_id=" +
"user_id=" +
uid + uid +
"&SmallShopId=" + "&SmallShopId=" +
SmallShopId + SmallShopId +
...@@ -474,36 +313,34 @@ export default { ...@@ -474,36 +313,34 @@ export default {
Up + Up +
"&id=" + "&id=" +
this.ID, this.ID,
imageUrl: imageUrl: this.details.BannerList && this.details.BannerList.length > 0 ?
this.details.BannerList && this.details.BannerList.length > 0 this.details.BannerList[0] :
? this.details.BannerList[0] "",
: "",
}; };
}, },
onShareAppMessage(res) { onShareAppMessage(res) {
//朋友 //朋友
let uid = uni.getStorageSync("mall_UserInfo") let uid = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserId uni.getStorageSync("mall_UserInfo").UserId :
: 0; 0;
if (uid == 0) { if (uid == 0) {
uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0; uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
} }
let SmallShopId = uni.getStorageSync("mall_UserInfo") let SmallShopId = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").SmallShopId uni.getStorageSync("mall_UserInfo").SmallShopId :
: 0; 0;
if (SmallShopId == 0) { if (SmallShopId == 0) {
//如果微店id为0 去找所属微店id //如果微店id为0 去找所属微店id
SmallShopId = uni.getStorageSync("mall_UserInfo") SmallShopId = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserSmallShopId uni.getStorageSync("mall_UserInfo").UserSmallShopId :
: 0; 0;
} }
let Up = uni.getStorageSync("mall_UserInfo") let Up = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserPageType uni.getStorageSync("mall_UserInfo").UserPageType :
: 0; 0;
return { return {
title: this.details.FullBrandName ? this.details.FullBrandName : "", title: this.details.FullBrandName ? this.details.FullBrandName : "",
path: path: "/pages/index/index?user_id=" +
"/pages/index/index?user_id=" +
uid + uid +
"&SmallShopId=" + "&SmallShopId=" +
SmallShopId + SmallShopId +
...@@ -512,10 +349,9 @@ export default { ...@@ -512,10 +349,9 @@ export default {
"&id=" + "&id=" +
this.ID + this.ID +
"&JumpType=15", "&JumpType=15",
imageUrl: imageUrl: this.details.BannerList && this.details.BannerList.length > 0 ?
this.details.BannerList && this.details.BannerList.length > 0 this.details.BannerList[0] :
? this.details.BannerList[0] "",
: "",
}; };
}, },
methods: { methods: {
...@@ -541,8 +377,7 @@ export default { ...@@ -541,8 +377,7 @@ export default {
console.log(e); console.log(e);
}, },
GetBrandDetails() { GetBrandDetails() {
this.request2( this.request2({
{
url: "/api/AppletTrade/GetBrandDetails", url: "/api/AppletTrade/GetBrandDetails",
data: { data: {
ID: this.ID, ID: this.ID,
...@@ -576,8 +411,8 @@ export default { ...@@ -576,8 +411,8 @@ export default {
current: i, current: i,
longPressActions: { longPressActions: {
itemList: ["发送给朋友", "保存图片", "收藏"], itemList: ["发送给朋友", "保存图片", "收藏"],
success: function (data) {}, success: function(data) {},
fail: function (err) { fail: function(err) {
console.log(err.errMsg); console.log(err.errMsg);
}, },
}, },
...@@ -586,9 +421,9 @@ export default { ...@@ -586,9 +421,9 @@ export default {
scroll(e) { scroll(e) {
this.boxOption = Math.floor((e.detail.scrollTop - 50) / 1.5); this.boxOption = Math.floor((e.detail.scrollTop - 50) / 1.5);
this.titleStyle.opacity = this.titleStyle.opacity =
(e.detail.scrollTop - 100 < 0 (e.detail.scrollTop - 100 < 0 ?
? 0 0 :
: Math.floor(e.detail.scrollTop - 100)) + "%"; Math.floor(e.detail.scrollTop - 100)) + "%";
this.tooltipShow = false; this.tooltipShow = false;
this.$forceUpdate(); this.$forceUpdate();
}, },
...@@ -615,8 +450,7 @@ export default { ...@@ -615,8 +450,7 @@ export default {
} }
}, },
getlove() { getlove() {
this.request2( this.request2({
{
url: "/api/AppletTrade/GetCollect", url: "/api/AppletTrade/GetCollect",
data: { data: {
Type: 2, Type: 2,
...@@ -636,42 +470,43 @@ export default { ...@@ -636,42 +470,43 @@ export default {
); );
}, },
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.flex { .flex {
display: flex; display: flex;
} }
.wrap { .wrap {
flex-wrap: wrap; flex-wrap: wrap;
} }
.flex-center { .flex-center {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.flex-between { .flex-between {
justify-content: space-between; justify-content: space-between;
} }
.item-center { .item-center {
align-items: center; align-items: center;
} }
.bg-red { .bg-red {
background-color: #d40224; background-color: #d40224;
} }
.detail-box { .detail-box {
width: 100%; width: 100%;
box-shadow: 0px -4rpx 71rpx 0rpx rgba(111, 111, 111, 0.26); box-shadow: 0px -4rpx 71rpx 0rpx rgba(111, 111, 111, 0.26);
border-radius: 50rpx 50rpx 0rpx 0rpx; border-radius: 50rpx 50rpx 0rpx 0rpx;
padding: 40rpx 40rpx 90rpx 40rpx; padding: 40rpx 40rpx 90rpx 40rpx;
font-family: PingFang SC; font-family: PingFang SC;
background-color: #ffffff; background-color: #ffffff;
.header { .header {
margin-bottom: 20rpx; margin-bottom: 20rpx;
...@@ -781,26 +616,26 @@ export default { ...@@ -781,26 +616,26 @@ export default {
} }
} }
} }
} }
.brand-title { .brand-title {
width: 134rpx; width: 134rpx;
margin-top: 30px; margin-top: 30px;
} }
.brand-title image { .brand-title image {
width: 100%; width: 100%;
height: auto; height: auto;
} }
.Listbox { .Listbox {
width: 100%; width: 100%;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 10px; margin-top: 10px;
} }
.Listbox-item { .Listbox-item {
width: 25%; width: 25%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -808,17 +643,17 @@ export default { ...@@ -808,17 +643,17 @@ export default {
height: 170rpx; height: 170rpx;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.Listbox-item image { .Listbox-item image {
width: 74rpx; width: 74rpx;
height: auto; height: auto;
} }
.list-item-text { .list-item-text {
width: calc(100vw / 4); width: calc(100vw / 4);
margin-top: 5px; margin-top: 5px;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
} }
</style> </style>
\ No newline at end of file
pages/kotra/brand/list.vue
View file @ 07d7344f
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
:style="{'background': TenantId!=18?`linear-gradient(-3deg, #eff8ff, #c6e6ff)`:''}"> :style="{'background': TenantId!=18?`linear-gradient(-3deg, #eff8ff, #c6e6ff)`:''}">
<headers :title="replace.state=='1'?'品牌列表':'企业列表'"></headers> <headers :title="replace.state=='1'?'品牌列表':'企业列表'"></headers>
<view v-if="TenantId==18" style="padding: 5px 10px"> <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" v-model="msg.BrandName" @search="searchHandler" @custom="searchHandler"
bg-color="#FFF"></u-search> bg-color="#FFF"></u-search>
</view> </view>
...@@ -41,9 +41,6 @@ ...@@ -41,9 +41,6 @@
:active-color="mainColor" :current="active" @change="changeHandler" :show-bar="true" :active-color="mainColor" :current="active" @change="changeHandler" :show-bar="true"
:activeFontSize="34" :bold="true" height="100" duration="0" font-size="28"></u-tabs> :activeFontSize="34" :bold="true" height="100" duration="0" font-size="28"></u-tabs>
</view> </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>
<view class="brandScreen"> <view class="brandScreen">
<view class="statusBox" v-if="msg.IsInChengdu == 0" @click="changeFirstStoreTest(-1)"> <view class="statusBox" v-if="msg.IsInChengdu == 0" @click="changeFirstStoreTest(-1)">
...@@ -57,9 +54,11 @@ ...@@ -57,9 +54,11 @@
<view v-for="(item, index) in PrizeList" :key="index" class="screenBoxItem" <view v-for="(item, index) in PrizeList" :key="index" class="screenBoxItem"
@click="chooseYear(item)"> @click="chooseYear(item)">
<view class="screenBoxItemYear" :class="{ activeYear: item.Id == msg.PrizeId }"> <view class="screenBoxItemYear" :class="{ activeYear: item.Id == msg.PrizeId }">
{{ item.YearInfo }}</view> {{ item.YearInfo }}
</view>
<view class="screenBoxItemName" :class="{ activeName: item.Id == msg.PrizeId }"> <view class="screenBoxItemName" :class="{ activeName: item.Id == msg.PrizeId }">
{{ item.Name }}</view> {{ item.Name }}
</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -229,7 +228,9 @@ ...@@ -229,7 +228,9 @@
"background": "#FFF" "background": "#FFF"
}, },
TenantId: null, TenantId: null,
replace: null, replace: {
state: "1", //1-品牌，2-企业服务
},
secondary: null, secondary: null,
GetYBConfig: null, GetYBConfig: null,
iscpswjselectall: 0, iscpswjselectall: 0,
...@@ -298,10 +299,11 @@ ...@@ -298,10 +299,11 @@
this.iscpswjselectall = uni.getStorageSync("basedata").iscpswjselectall this.iscpswjselectall = uni.getStorageSync("basedata").iscpswjselectall
let uid = uni.getStorageSync("mall_UserInfo") let uid = uni.getStorageSync("mall_UserInfo")
this.TenantId = uid.TenantId this.TenantId = uid.TenantId
// this.msg.TenantId = uid.TenantId let tempReplace = uni.getStorageSync('replace_page_index')
this.replace = uni.getStorageSync('replace_page_index') if (tempReplace && tempReplace.state) {
this.replace.state = tempReplace.state;
}
this.msg.BrandEnterpriseType = this.replace.state == '1' ? 1 : 2 this.msg.BrandEnterpriseType = this.replace.state == '1' ? 1 : 2
if (options && options.id) { if (options && options.id) {
this.msg.BrandClassId = options.id; this.msg.BrandClassId = options.id;
} }
...@@ -316,12 +318,9 @@ ...@@ -316,12 +318,9 @@
this.GetBrandClassList(); this.GetBrandClassList();
this.getPrizeList(); this.getPrizeList();
// } // }
}, },
created() { created() {
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
}, },
mounted() { mounted() {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
...@@ -436,8 +435,11 @@ ...@@ -436,8 +435,11 @@
init() { init() {
let url = "/api/AppletTrade/GetBrandPageList" let url = "/api/AppletTrade/GetBrandPageList"
if (this.TenantId != 18 && this.replace.state) { if (this.TenantId != 18 && this.replace.state) {
if (this.replace.state == '1') url = "/api/AppletTrade/GetAllBrandEnterprisePageList" if (this.replace.state == '1') {
else url = "/api/AppletTrade/GetEnterpriseServicesPageList" url = "/api/AppletTrade/GetAllBrandEnterprisePageList"
} else {
url = "/api/AppletTrade/GetEnterpriseServicesPageList"
}
} }
this.request2({ this.request2({
url: url, url: url,
...@@ -489,7 +491,6 @@ ...@@ -489,7 +491,6 @@
this.g = []; this.g = [];
this.init(); this.init();
// } // }
}, },
getPrizeList() { getPrizeList() {
this.request2({ this.request2({
......
pages/kotra/carrier/list.vue
View file @ 07d7344f
<template> <template>
<div <div style="background-color: #f6f6f6; overflow: hidden" :style="{ height: contentHeight + 'px' }">
style="background-color: #f6f6f6; overflow: hidden"
:style="{ height: contentHeight + 'px' }"
>
<view class="carrierHeadBgBox" <view class="carrierHeadBgBox"
:style="{'background': TenantId!=18?`linear-gradient(-3deg, #eff8ff, #c6e6ff)`:''}"> :style="{'background': TenantId!=18?`linear-gradient(-3deg, #eff8ff, #c6e6ff)`:''}">
<headers :title="replace.state=='1'?'载体列表':'楼宇列表'"></headers> <headers :title="replace.state=='1'?'项目列表':'写字楼列表'"></headers>
<template v-if="isauth"> <template v-if="isauth">
<view v-if="TenantId==18" style="padding: 5px 10px"> <view v-if="TenantId==18" style="padding: 5px 10px">
{{TenantId}} <u-search placeholder="搜索名称" :focus="false" :show-action="false" :clearabled="true" radius="40"
<u-search v-model="searchKey" @search="searchHandler" @custom="searchHandler" bg-color="#FFF"></u-search>
placeholder="搜索载体名称"
:focus="false"
:show-action="false"
:clearabled="true"
radius="40"
v-model="searchKey"
@search="searchHandler"
@custom="searchHandler"
bg-color="#FFF"
></u-search>
</view> </view>
<view v-else class="carrierSearch" style="padding: 5px 10px;margin-top: 6rpx;"> <view v-else class="carrierSearch" style="padding: 5px 10px;margin-top: 6rpx;">
<template v-if="iscpswjselectall==1&&replace.state=='1'"> <template v-if="iscpswjselectall==1&&replace.state=='1'">
<view class="carrierSearch-left"> <view class="carrierSearch-left">
<uni-section title="" type="line"> <uni-section title="" type="line">
<uni-data-select <uni-data-select v-model="msg.MallBaseId" :localdata="ShopTypeList" :clear="false"
v-model="msg.MallBaseId" @change="ResetQuery"></uni-data-select>
:localdata="ShopTypeList"
:clear="false"
@change="ResetQuery"
></uni-data-select>
</uni-section> </uni-section>
</view> </view>
<view class="carrierSearch-auto"></view> <view class="carrierSearch-auto"></view>
</template> </template>
<view class="carrierSearch-right"> <view class="carrierSearch-right">
<input v-if="replace.state=='1'" v-model="msg.CarrierName" <input v-if="replace.state=='1'" v-model="msg.CarrierName" :placeholder="`搜索项目名称`"
:placeholder="`搜索载体名称`"
@input="ResetQuery"></input>
<input v-else v-model="msg.MetroName"
:placeholder="`搜索楼宇名称`"
@input="ResetQuery"></input> @input="ResetQuery"></input>
<input v-else v-model="msg.MetroName" :placeholder="`搜索写字楼名称`" @input="ResetQuery"></input>
</view> </view>
</view> </view>
</template> </template>
<template v-if="TenantId==18"> <template v-if="TenantId==18">
<view style="display: flex; align-items: center"> <view style="display: flex; align-items: center">
<view style="flex: 1; overflow: hidden"> <view style="flex: 1; overflow: hidden">
<u-tabs <u-tabs bg-color="#f6f6f6" :is-scroll="true" name="Name" :list="typeList"
bg-color="#f6f6f6" :active-color="mainColor" :active-item-style="activeItemStyle" :current="active"
:is-scroll="true" @change="changeHandler" :show-bar="true" :activeFontSize="34" :bold="true" height="100"
name="Name" duration="0" :font-size="28"></u-tabs>
:list="typeList"
:active-color="mainColor"
:active-item-style="activeItemStyle"
:current="active"
@change="changeHandler"
:show-bar="true"
:activeFontSize="34"
:bold="true"
height="100"
duration="0"
:font-size="28"
></u-tabs>
</view> </view>
<!-- <div style="width: 60rpx" @click="showPopup = true">
<u-icon name="wap-nav" color="#111" size="42"></u-icon>
</div> -->
</view> </view>
<view class="carrierScreen" v-if="isauth"> <view class="carrierScreen" v-if="isauth">
<view class="statusBox"> <view class="statusBox">
<picker @change="statusChange" :range="kystatus" range-key="name"> <picker @change="statusChange" :range="kystatus" range-key="name">
<view class="curStatusName" <view class="curStatusName">{{ curStatusName
>{{ curStatusName }}<u-icon name="arrow-down" color="#ffffff" size="22" style="margin-left: 10rpx"></u-icon></view>
}}<u-icon
name="arrow-down"
color="#ffffff"
size="22"
style="margin-left: 10rpx"
></u-icon
></view>
</picker> </picker>
</view> </view>
<view <view class="statusBox" v-if="msg.FirstStoreTest === 1" @click="changeFirstStoreTest(0)">
class="statusBox"
v-if="msg.FirstStoreTest === 1"
@click="changeFirstStoreTest(0)"
>
首店经济试验场 首店经济试验场
</view> </view>
<view <view class="statusBox2" v-if="msg.FirstStoreTest === 0" @click="changeFirstStoreTest(1)">
class="statusBox2"
v-if="msg.FirstStoreTest === 0"
@click="changeFirstStoreTest(1)"
>
首店经济试验场 首店经济试验场
</view> </view>
</view> </view>
</template> </template>
<view v-else style="display: flex; align-items: center;padding: 28rpx 0;"> <view v-else style="display: flex; align-items: center;padding: 28rpx 0;">
<view style="flex: 1; overflow: hidden;padding-left: 32rpx;" <view style="flex: 1; overflow: hidden;padding-left: 32rpx;" class="carrierTabBox">
class="carrierTabBox"> <u-tabs bg-color="none" :is-scroll="true" name="ClassName" :list="typeList"
<u-tabs :active-color="mainColor" inactive-color="#000000" :active-item-style="activeItemStyleCarr"
bg-color="none" :current="active" @change="changeHandler" :show-bar="false" :activeFontSize="28" :bold="true"
:is-scroll="true" height="45" duration="0" :font-size="26" gutter="29"></u-tabs>
name="ClassName"
:list="typeList"
:active-color="mainColor"
inactive-color="#000000"
:active-item-style="activeItemStyleCarr"
:current="active"
@change="changeHandler"
:show-bar="false"
:activeFontSize="28"
:bold="true"
height="45"
duration="0"
:font-size="26"
gutter="29"
></u-tabs>
</view> </view>
</view> </view>
</view> </view>
<u-empty <u-empty v-if="dataList&&dataList.length == 0" text="暂无数据" mode="list" class="noBox"></u-empty>
v-if="dataList&&dataList.length == 0" <view :style="{ height: TenantId==18?'calc(100% - 101px)':'calc(100% - 191px)'}"
text="暂无数据"
mode="list"
class="noBox"
></u-empty>
<view
:style="{ height: TenantId==18?'calc(100% - 101px)':'calc(100% - 191px)'}"
v-if="dataList&&dataList.length > 0"> v-if="dataList&&dataList.length > 0">
<scroll-view <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower"
:scroll-y="true" style="height: 100%; padding-bottom: 0px">
:enable-back-to-top="true"
:enable-flex="true"
@scrolltolower="lower"
style="height: 100%; padding-bottom: 0px"
>
<template v-if="TenantId==18"> <template v-if="TenantId==18">
<view v-for="(item, index) in dataList" :key="index"> <view v-for="(item, index) in dataList" :key="index">
<div <div class="good_study_one" @click="openGood(item.ID, typeList[item.ProjectType].Name)" :style="{
class="good_study_one"
@click="openGood(item.ID, typeList[item.ProjectType].Name)"
:style="{
borderRadius: '15px', borderRadius: '15px',
}" }">
>
<view class="carriertag" v-if="item.FirstStoreTest === 1"> <view class="carriertag" v-if="item.FirstStoreTest === 1">
<view class="carriertagsub1">首店</view> <view class="carriertagsub1">首店</view>
<view class="carriertagsub2">经济试验场</view> <view class="carriertagsub2">经济试验场</view>
</view> </view>
<view class="img-box"> <view class="img-box">
<view class="img-show"> <view class="img-show">
<image <image style="width: 100%;height: 100%;border-radius: 10rpx 10rpx 0 0;"
style=" mode="aspectFill" :src="item.BannerList[0]" />
width: 100%;
height: 100%;
border-radius: 10rpx 10rpx 0 0;
"
mode="aspectFill"
:src="item.BannerList[0]"
/>
</view> </view>
</view> </view>
<div class="good-info"> <div class="good-info">
...@@ -171,37 +84,26 @@ ...@@ -171,37 +84,26 @@
<div class="span-name" style="display: flex"> <div class="span-name" style="display: flex">
<div class="span-name-sub">{{ item.CarrierName }}</div> <div class="span-name-sub">{{ item.CarrierName }}</div>
<view v-if="item.ListEnroll.length > 0"> <view v-if="item.ListEnroll.length > 0">
<image <image style="height: 100%; border-radius: 10rpx 10rpx 0 0" mode="heightFix"
style="height: 100%; border-radius: 10rpx 10rpx 0 0" :src="item.ListEnroll[0].MedalImage" />
mode="heightFix"
:src="item.ListEnroll[0].MedalImage"
/>
</view> </view>
</div> </div>
<div class="span-type"> <div class="span-type">
{{ item.ProjectTypeName }} {{ item.ProjectTypeName }}
<text <text v-if="item.OpeningStatus == 0" style="
v-if="item.OpeningStatus == 0"
style="
font-size: 24rpx; font-size: 24rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #f70027; color: #f70027;
margin-left: 10rpx; margin-left: 10rpx;
" ">即将开业</text>
>即将开业</text <text v-if="item.OpeningStatus == 1" style="
>
<text
v-if="item.OpeningStatus == 1"
style="
font-size: 24rpx; font-size: 24rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #111111; color: #111111;
margin-left: 10rpx; margin-left: 10rpx;
" ">已开业</text>
>已开业</text
>
</div> </div>
</div> </div>
<div class="good-price-info"> <div class="good-price-info">
...@@ -218,14 +120,8 @@ ...@@ -218,14 +120,8 @@
<carrierElement v-if="dataList&&dataList.length>0" :dataList="dataList"></carrierElement> <carrierElement v-if="dataList&&dataList.length>0" :dataList="dataList"></carrierElement>
</template> </template>
<u-loadmore <u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20"
:status="status" bg-color="#F6F6F6" />
:load-text="loadText"
:font-size="24"
:margin-top="20"
:margin-bottom="20"
bg-color="#F6F6F6"
/>
</scroll-view> </scroll-view>
</view> </view>
<!-- 加载中 --> <!-- 加载中 -->
...@@ -233,17 +129,17 @@ ...@@ -233,17 +129,17 @@
<u-loading mode="flower" size="48"></u-loading> <u-loading mode="flower" size="48"></u-loading>
<Text style="color: #f6f6f6; margin-top: 10rpx">加载中...</Text> <Text style="color: #f6f6f6; margin-top: 10rpx">加载中...</Text>
</view> </view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth" ></auth> <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<tabbars></tabbars> <tabbars></tabbars>
</div> </div>
</template> </template>
<script> <script>
import auth from "@/components/auth/index.vue"; import auth from "@/components/auth/index.vue";
import tabbars from "@/components/tabbar/index"; import tabbars from "@/components/tabbar/index";
import headers from "@/components/header/header"; import headers from "@/components/header/header";
import carrierElement from "./carrierElement"; import carrierElement from "./carrierElement";
export default { export default {
components: { components: {
tabbars, tabbars,
auth, auth,
...@@ -252,9 +148,9 @@ export default { ...@@ -252,9 +148,9 @@ export default {
}, },
data() { data() {
return { return {
showAuth:false, showAuth: false,
u:{}, u: {},
isauth:false, isauth: false,
mainColor: "", mainColor: "",
active: 0, active: 0,
searchKey: "", searchKey: "",
...@@ -273,11 +169,9 @@ export default { ...@@ -273,11 +169,9 @@ export default {
OrderBy: 0, OrderBy: 0,
OpeningStatus: -1, OpeningStatus: -1,
FirstStoreTest: 0, FirstStoreTest: 0,
CategoryId: 0, CategoryId: 0,
BuildingCarrierType: null, BuildingCarrierType: null,
IsChengDu: -1,//首店类型 1成都 0宜宾 IsChengDu: -1, //首店类型 1成都 0宜宾
OrderBy: "", OrderBy: "",
MallBaseId: 0, MallBaseId: 0,
TenantId: 0, TenantId: 0,
...@@ -297,7 +191,7 @@ export default { ...@@ -297,7 +191,7 @@ export default {
"font-weight": 800, "font-weight": 800,
color: "#111111", color: "#111111",
}, },
activeItemStyleCarr:{ activeItemStyleCarr: {
"font-size": "23rpx", "font-size": "23rpx",
"font-family": "PingFang SC", "font-family": "PingFang SC",
"font-weight": "Bold", "font-weight": "Bold",
...@@ -310,8 +204,7 @@ export default { ...@@ -310,8 +204,7 @@ export default {
"background": "#FFF" "background": "#FFF"
}, },
list: [], list: [],
kystatus: [ kystatus: [{
{
id: -1, id: -1,
name: "全部", name: "全部",
}, },
...@@ -326,7 +219,9 @@ export default { ...@@ -326,7 +219,9 @@ export default {
], ],
curStatusName: "全部", curStatusName: "全部",
TenantId: null, TenantId: null,
replace: null, replace: {
state: "1", //1-载体项目，2-楼宇
},
secondary: null, secondary: null,
ShopTypeList: [ ShopTypeList: [
// { // {
...@@ -348,24 +243,24 @@ export default { ...@@ -348,24 +243,24 @@ export default {
}, },
onShareTimeline() { onShareTimeline() {
//朋友圈 //朋友圈
let uid = uni.getStorageSync("mall_UserInfo") let uid = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserId uni.getStorageSync("mall_UserInfo").UserId :
: 0; 0;
if (uid == 0) { if (uid == 0) {
uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0; uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
} }
let SmallShopId = uni.getStorageSync("mall_UserInfo") let SmallShopId = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").SmallShopId uni.getStorageSync("mall_UserInfo").SmallShopId :
: 0; 0;
if (SmallShopId == 0) { if (SmallShopId == 0) {
//如果微店id为0 去找所属微店id //如果微店id为0 去找所属微店id
SmallShopId = uni.getStorageSync("mall_UserInfo") SmallShopId = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserSmallShopId uni.getStorageSync("mall_UserInfo").UserSmallShopId :
: 0; 0;
} }
let Up = uni.getStorageSync("mall_UserInfo") let Up = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserPageType uni.getStorageSync("mall_UserInfo").UserPageType :
: 0; 0;
return { return {
title: "载体列表", title: "载体列表",
query: "user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" + Up, query: "user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" + Up,
...@@ -374,28 +269,27 @@ export default { ...@@ -374,28 +269,27 @@ export default {
}, },
onShareAppMessage(res) { onShareAppMessage(res) {
//朋友 //朋友
let uid = uni.getStorageSync("mall_UserInfo") let uid = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserId uni.getStorageSync("mall_UserInfo").UserId :
: 0; 0;
if (uid == 0) { if (uid == 0) {
uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0; uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
} }
let SmallShopId = uni.getStorageSync("mall_UserInfo") let SmallShopId = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").SmallShopId uni.getStorageSync("mall_UserInfo").SmallShopId :
: 0; 0;
if (SmallShopId == 0) { if (SmallShopId == 0) {
//如果微店id为0 去找所属微店id //如果微店id为0 去找所属微店id
SmallShopId = uni.getStorageSync("mall_UserInfo") SmallShopId = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserSmallShopId uni.getStorageSync("mall_UserInfo").UserSmallShopId :
: 0; 0;
} }
let Up = uni.getStorageSync("mall_UserInfo") let Up = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserPageType uni.getStorageSync("mall_UserInfo").UserPageType :
: 0; 0;
return { return {
title: "载体列表", title: "载体列表",
path: path: "/pages/kotra/carrier/list?user_id=" +
"/pages/kotra/carrier/list?user_id=" +
uid + uid +
"&SmallShopId=" + "&SmallShopId=" +
SmallShopId + SmallShopId +
...@@ -408,9 +302,11 @@ export default { ...@@ -408,9 +302,11 @@ export default {
this.iscpswjselectall = uni.getStorageSync("basedata").iscpswjselectall this.iscpswjselectall = uni.getStorageSync("basedata").iscpswjselectall
let uid = uni.getStorageSync("mall_UserInfo") let uid = uni.getStorageSync("mall_UserInfo")
this.TenantId = uid.TenantId this.TenantId = uid.TenantId
// this.msg.TenantId = uid.TenantId let tempReplace = uni.getStorageSync('replace_page_index')
this.replace = uni.getStorageSync('replace_page_index') if (tempReplace && tempReplace.state) {
this.msg.BuildingCarrierType = this.replace.state=='1'?1:2 this.replace.state = tempReplace.state;
}
this.msg.BuildingCarrierType = this.replace.state == '1' ? 1 : 2
if (options && options.id) { if (options && options.id) {
this.msg.ProjectType = options.id; this.msg.ProjectType = options.id;
...@@ -432,7 +328,6 @@ export default { ...@@ -432,7 +328,6 @@ export default {
this.getTypeList(); this.getTypeList();
this.isauth = true this.isauth = true
// } // }
}, },
created() { created() {
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
...@@ -440,13 +335,13 @@ export default { ...@@ -440,13 +335,13 @@ export default {
}, },
mounted() { mounted() {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "载体列表", title: "项目列表",
}); });
}, },
methods: { methods: {
reloadUserinfo() { reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
this.isauth = true;//成都登录 就显示 this.isauth = true; //成都登录 就显示
this.getTypeList(); this.getTypeList();
}, },
//关闭登录窗口 //关闭登录窗口
...@@ -455,20 +350,18 @@ export default { ...@@ -455,20 +350,18 @@ export default {
}, },
// 获取类型 // 获取类型
getTypeList() { getTypeList() {
if(this.TenantId==18){ if (this.TenantId == 18) {
let parms = { let parms = {
url: "/api/AppletTrade/GetProjectTypeEnumList", url: "/api/AppletTrade/GetProjectTypeEnumList",
}; };
this.request2(parms, (res) => { this.request2(parms, (res) => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
// this.pageCount = res.data.pageCount
this.typeList.push({ this.typeList.push({
Id: 0, Id: 0,
Name: "全部", Name: "推荐",
}); });
this.typeList = this.typeList.concat(res.data); this.typeList = this.typeList.concat(res.data);
if (this.msg.ProjectType == 0) { if (this.msg.ProjectType == 0) {} else {
} else {
//指定跳入分类 //指定跳入分类
this.typeList.map((x, i) => { this.typeList.map((x, i) => {
if (x.Id == this.msg.ProjectType) { if (x.Id == this.msg.ProjectType) {
...@@ -478,11 +371,11 @@ export default { ...@@ -478,11 +371,11 @@ export default {
} }
} }
}); });
}else{ } else {
this.request2({ this.request2({
url:"/api/AppletTrade/GetBrandClassList", url: "/api/AppletTrade/GetBrandClassList",
data: { data: {
BrandCategory: this.replace.state=='1' ? 1 : 2 BrandCategory: this.replace.state == '1' ? 1 : 2
} }
}, (res) => { }, (res) => {
...@@ -490,7 +383,7 @@ export default { ...@@ -490,7 +383,7 @@ export default {
this.typeList = res.data; this.typeList = res.data;
this.typeList.unshift({ this.typeList.unshift({
ID: 0, ID: 0,
ClassName: "全部", ClassName: "推荐",
}); });
if (this.msg.CategoryId) { if (this.msg.CategoryId) {
//指定跳入分类 //指定跳入分类
...@@ -509,7 +402,7 @@ export default { ...@@ -509,7 +402,7 @@ export default {
(res) => { (res) => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.GetYBConfig = res.data this.GetYBConfig = res.data
res.data.mallBaselList.forEach(x=>{ res.data.mallBaselList.forEach(x => {
let obj = { let obj = {
text: x.Name, text: x.Name,
value: x.MallBaseId value: x.MallBaseId
...@@ -520,19 +413,18 @@ export default { ...@@ -520,19 +413,18 @@ export default {
} }
); );
} }
this.getCarrierPageList(); this.getCarrierPageList();
}, },
ResetQuery(){ ResetQuery() {
this.dataList = [] this.dataList = []
this.msg.pageIndex=1 this.msg.pageIndex = 1
this.getCarrierPageList() this.getCarrierPageList()
}, },
// 获取载体分页列表 // 获取载体分页列表
getCarrierPageList() { getCarrierPageList() {
let url = "/api/AppletTrade/GetCarrierPageList" let url = "/api/AppletTrade/GetCarrierPageList"
if(this.TenantId!=18&&this.replace.state){ if (this.TenantId != 18 && this.replace.state) {
if(this.replace.state=='1') url = "/api/AppletTrade/GetAllCarrierPageList" if (this.replace.state == '1') url = "/api/AppletTrade/GetAllCarrierPageList"
else url = "/api/AppletTrade/GetBuildingPageList" else url = "/api/AppletTrade/GetBuildingPageList"
} }
this.request2({ this.request2({
...@@ -553,7 +445,7 @@ export default { ...@@ -553,7 +445,7 @@ export default {
}, },
changeHandler(i) { changeHandler(i) {
this.active = i; this.active = i;
if(this.TenantId==18) this.msg.ProjectType = this.typeList[i].Id; if (this.TenantId == 18) this.msg.ProjectType = this.typeList[i].Id;
else this.msg.CategoryId = this.typeList[i].ID; else this.msg.CategoryId = this.typeList[i].ID;
this.ResetQuery() this.ResetQuery()
}, },
...@@ -563,7 +455,6 @@ export default { ...@@ -563,7 +455,6 @@ export default {
}); });
}, },
searchHandler(val) { searchHandler(val) {
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) { if (!this.u) {
this.u = { this.u = {
...@@ -604,11 +495,11 @@ export default { ...@@ -604,11 +495,11 @@ export default {
this.getCarrierPageList(); this.getCarrierPageList();
}, },
}, },
}; };
</script> </script>
<style> <style>
.carrierTabBox .u-tab-item{ .carrierTabBox .u-tab-item {
background: #FFFFFF; background: #FFFFFF;
margin-right: 29rpx; margin-right: 29rpx;
border-radius: 10rpx; border-radius: 10rpx;
...@@ -616,14 +507,17 @@ export default { ...@@ -616,14 +507,17 @@ export default {
padding: 13rpx 22rpx; padding: 13rpx 22rpx;
border: 1rpx solid #FFFFFF; border: 1rpx solid #FFFFFF;
} }
.carrierSearch-right>input::placeholder{
.carrierSearch-right>input::placeholder {
color: #95AAB9; color: #95AAB9;
} }
.carrierSearch-right{
.carrierSearch-right {
font-size: 27rpx; font-size: 27rpx;
font-weight: 100; font-weight: 100;
} }
.carrierSearch-auto{
.carrierSearch-auto {
width: 2rpx; width: 2rpx;
height: 40rpx; height: 40rpx;
background: #E1EDF7; background: #E1EDF7;
...@@ -631,37 +525,39 @@ export default { ...@@ -631,37 +525,39 @@ export default {
margin-left: 30rpx; margin-left: 30rpx;
margin-right: 30rpx; margin-right: 30rpx;
} }
.carrierSearch-ex{
.carrierSearch-ex {
width: 152rpx; width: 152rpx;
/* position: absolute;
width: 202rpx;
left: 0;
top: 0;
z-index: 1; */
} }
.carrierSearch-left .uni-select__selector{
.carrierSearch-left .uni-select__selector {
/* width: 202rpx !important; */ /* width: 202rpx !important; */
} }
.carrierSearch-left .uni-icons{
.carrierSearch-left .uni-icons {
color: #017EDF !important; color: #017EDF !important;
margin-left: 24rpx !important; margin-left: 24rpx !important;
} }
.carrierSearch-left .uni-select__input-text{
.carrierSearch-left .uni-select__input-text {
font-size: 27rpx; font-size: 27rpx;
font-weight: bold; font-weight: bold;
} }
.carrierSearch-left .uni-select { .carrierSearch-left .uni-select {
border: 0; border: 0;
padding: 0; padding: 0;
padding-left: 0; padding-left: 0;
} }
.carrierSearch-left{
.carrierSearch-left {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
font-family: PingFang SC; font-family: PingFang SC;
} }
.carrierSearch{
.carrierSearch {
height: 76rpx; height: 76rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
...@@ -672,43 +568,37 @@ export default { ...@@ -672,43 +568,37 @@ export default {
border-radius: 18rpx; border-radius: 18rpx;
position: relative; position: relative;
} }
.good_study_one {
.good_study_one {
margin: 12px; margin: 12px;
position: relative; position: relative;
border: 1rpx solid transparent; border: 1rpx solid transparent;
border-radius: 10rpx; border-radius: 10rpx;
overflow: hidden; overflow: hidden;
} }
.good_study_one .tips { .good_study_one .tips {
width: 64rpx; width: 64rpx;
height: 64rpx; height: 64rpx;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
z-index: 4; z-index: 4;
} }
.good_study_one .guding { .good_study_one .guding {
position: relative; position: relative;
} }
/* .good_study_one .guding .img-box { .good_study_one .img-box {
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
} */
.good_study_one .img-box {
width: 100%; width: 100%;
height: 0; height: 0;
padding-top: 49%; padding-top: 49%;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
.good_study_one .img-box .img-show { .good_study_one .img-box .img-show {
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
...@@ -717,60 +607,65 @@ export default { ...@@ -717,60 +607,65 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
} }
.good_study_one .good-info { .good_study_one .good-info {
padding: 12px; padding: 12px;
background-color: #fff; background-color: #fff;
} }
.good_study_one .good-info .good-name { .good_study_one .good-info .good-name {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding-bottom: 5px; padding-bottom: 5px;
} }
.good_study_one .good-info .good-name .span-name {
.good_study_one .good-info .good-name .span-name {
width: 350rpx; width: 350rpx;
height: 40rpx; height: 40rpx;
font-size: 28rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
color: #111; color: #111;
} }
.span-name-sub {
.span-name-sub {
max-width: 320rpx; max-width: 320rpx;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.good_study_one .good-info .good-name .span-type {
.good_study_one .good-info .good-name .span-type {
font-weight: 500; font-weight: 500;
color: #999999; color: #999999;
font-size: 24rpx; font-size: 24rpx;
margin-left: 10px; margin-left: 10px;
} }
.good_study_one .good-info .good-price-info {
.good_study_one .good-info .good-price-info {
display: flex; display: flex;
} }
.good_study_one .good-info .good-price-info .price { .good_study_one .good-info .good-price-info .price {
color: #999999; color: #999999;
font-size: 24rpx; font-size: 24rpx;
flex: 1; flex: 1;
} }
.good_study_one .good-info .good-price-info .buy { .good_study_one .good-info .good-price-info .buy {
width: 24px; width: 24px;
text-align: right; text-align: right;
} }
.carrierScreen {
.carrierScreen {
height: 50rpx; height: 50rpx;
margin: 20rpx 0; margin: 20rpx 0;
display: flex; display: flex;
padding: 0 30rpx; padding: 0 30rpx;
} }
.statusBox {
/* width: 150rpx; */ .statusBox {
height: 46rpx; height: 46rpx;
background: #1f1f1f; background: #1f1f1f;
border-radius: 23rpx; border-radius: 23rpx;
...@@ -783,16 +678,17 @@ export default { ...@@ -783,16 +678,17 @@ export default {
font-size: 22rpx; font-size: 22rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
} }
.curStatusName {
.curStatusName {
font-size: 22rpx; font-size: 22rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #ffffff; color: #ffffff;
display: flex; display: flex;
} }
.statusBox2 {
/* width: 150rpx; */ .statusBox2 {
height: 46rpx; height: 46rpx;
background: #eaeaea; background: #eaeaea;
border-radius: 23rpx; border-radius: 23rpx;
...@@ -804,8 +700,9 @@ export default { ...@@ -804,8 +700,9 @@ export default {
font-size: 22rpx; font-size: 22rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
} }
.carriertag {
.carriertag {
width: 170rpx; width: 170rpx;
height: 40rpx; height: 40rpx;
background: #fff; background: #fff;
...@@ -817,8 +714,9 @@ export default { ...@@ -817,8 +714,9 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.carriertagsub1 {
.carriertagsub1 {
width: 48rpx; width: 48rpx;
height: 22rpx; height: 22rpx;
background: #1f1f1f; background: #1f1f1f;
...@@ -830,8 +728,9 @@ export default { ...@@ -830,8 +728,9 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.carriertagsub2 {
.carriertagsub2 {
width: 100rpx; width: 100rpx;
height: 22rpx; height: 22rpx;
background: #d0aa7b; background: #d0aa7b;
...@@ -843,5 +742,5 @@ export default { ...@@ -843,5 +742,5 @@ export default {
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
} }
</style> </style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment