update
This commit is contained in:
ylj20011123
parent
faeb1c18c1
commit
e6d2ba84d6
@ -7,7 +7,7 @@
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div class="contentList">
|
||||
<div class="contentList" :style="{ height: `calc(100vh - ${safeHeight}px)` }">
|
||||
<!-- <div class="contentItem" v-for="(item, index) in messageList" :key="index" @click="handleGoDetail(item)"> -->
|
||||
<div class="contentItem" v-for="(item, index) in messageList" :key="index" @click="handleGoDetail(item)">
|
||||
<div class="left">
|
||||
@ -30,8 +30,8 @@
|
||||
" />
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div v-if="!(messageList && messageList.length > 0)"> -->
|
||||
<div v-if="!(allMessageList[selectTab] && allMessageList[selectTab].length > 0)">
|
||||
<div v-if="!(messageList && messageList.length > 0)">
|
||||
<!-- <div v-if="!(allMessageList[selectTab] && allMessageList[selectTab].length > 0)"> -->
|
||||
<no-data text="暂无内容" />
|
||||
</div>
|
||||
</div>
|
||||
@ -44,6 +44,7 @@ import NoData from "../../components/noData.vue";
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
safeHeight: {},
|
||||
tabList: [],
|
||||
selectTab: 0,
|
||||
messageList: [], // 当前显示的数据
|
||||
@ -59,6 +60,11 @@ export default {
|
||||
}),
|
||||
},
|
||||
onLoad() {
|
||||
let systemInfo = uni.getSystemInfoSync();
|
||||
let height = systemInfo.safeAreaInsets.bottom;
|
||||
this.safeHeight = Number(height);
|
||||
|
||||
|
||||
// 拿到tab的数据
|
||||
// this.handleGetTabList();
|
||||
// this.handleGetHighwayHeadlines()
|
||||
@ -370,7 +376,6 @@ export default {
|
||||
|
||||
.contentList {
|
||||
width: 100%;
|
||||
height: calc(100vh - 50px);
|
||||
overflow-y: auto;
|
||||
|
||||
.contentItem {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div class="main">
|
||||
<div class="main" :style="{ paddingBottom: `${safeHeight}px` }">
|
||||
<div v-if="showType === 1">
|
||||
<div class="pageTitle">{{ detailObj.NOTICEINFO_TITLE || "" }}</div>
|
||||
<div class="time">{{ detailObj.START_DATE || "-" }}</div>
|
||||
@ -35,6 +35,7 @@
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
safeHeight: "",
|
||||
detailObj: {
|
||||
// NOTICEINFO_TITLE: "",
|
||||
// START_DATE: "",
|
||||
@ -45,7 +46,10 @@ export default {
|
||||
};
|
||||
},
|
||||
onLoad(query) {
|
||||
console.log("query", query);
|
||||
let systemInfo = uni.getSystemInfoSync();
|
||||
let height = systemInfo.safeAreaInsets.bottom;
|
||||
this.safeHeight = Number(height);
|
||||
|
||||
if (query.id) {
|
||||
this.id = query.id
|
||||
if (query.type === 'true') {
|
||||
|
||||
@ -7,8 +7,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="contentList">
|
||||
<!-- <div class="contentItem" v-for="(item, index) in messageList" :key="index" @click="handleGoDetail(item)"> -->
|
||||
<scroll-view :scroll-y="true" class="contentList">
|
||||
<div class="contentItem" v-for="(item, index) in allMessageList[selectTab]" :key="index"
|
||||
@click="handleGoDetail(item)">
|
||||
<div class="left">
|
||||
@ -22,7 +21,8 @@
|
||||
</div>
|
||||
<div class="right">
|
||||
|
||||
<image class="leftIcon" v-if="item.ImageList && item.ImageList.length > 0" :src="item.ImageList[0].ImageUrl" />
|
||||
<image class="leftIcon" v-if="item.ImageList && item.ImageList.length > 0"
|
||||
:src="item.ImageList[0].ImageUrl" />
|
||||
|
||||
<image v-else class="leftIcon" :src="item.coverImg
|
||||
? item.coverImg
|
||||
@ -30,11 +30,10 @@
|
||||
" />
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div v-if="!(messageList && messageList.length > 0)"> -->
|
||||
<div v-if="!(allMessageList[selectTab] && allMessageList[selectTab].length > 0)">
|
||||
<no-data text="暂无内容" />
|
||||
</div>
|
||||
</div>
|
||||
</scroll-view>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -367,8 +366,7 @@ export default {
|
||||
|
||||
.contentList {
|
||||
width: 100%;
|
||||
height: calc(100vh - 50px);
|
||||
overflow-y: auto;
|
||||
height: calc(100vh - 70px);
|
||||
|
||||
.contentItem {
|
||||
width: 100%;
|
||||
|
||||
@ -32,7 +32,8 @@
|
||||
<view class="navList" id="navItem">
|
||||
<swiper class="swiper" circular :indicator-dots="true" :autoplay="true" indicator-color="rgba(255,255,255,0.6)"
|
||||
indicator-active-color="#ffffff">
|
||||
<swiper-item v-for="(item, index) in swiperList" :key="index" @click="handleFunClick({ value: 17 })">
|
||||
<swiper-item v-for="(item, index) in swiperList" :key="index"
|
||||
@click="handleFunClick({ value: 17, index: index })">
|
||||
<!-- @click="handleShowPreview(item)" -->
|
||||
<view class="swiper-item uni-bg-red">
|
||||
<image class="img" :src="item" />
|
||||
@ -455,13 +456,15 @@ export default {
|
||||
},
|
||||
pageType: "", // spring 春节模式
|
||||
swiperList: [
|
||||
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg",
|
||||
// "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg",
|
||||
"http://saas.eshangtech.com/minTestImg/正大泰国榴莲.jpg",
|
||||
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg",
|
||||
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥_1.jpg",
|
||||
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区_1.jpg",
|
||||
],
|
||||
previewImageList: [
|
||||
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg",
|
||||
// "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg",
|
||||
"http://saas.eshangtech.com/minTestImg/正大泰国榴莲.jpg",
|
||||
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/正太泰国榴莲.jpg",
|
||||
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg",
|
||||
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥.jpg",
|
||||
@ -496,7 +499,7 @@ export default {
|
||||
let _this = this
|
||||
setTimeout(() => {
|
||||
_this.$refs.noticeRef.close();
|
||||
}, 5000)
|
||||
}, 8000)
|
||||
|
||||
} else {
|
||||
this.showPoster = false;
|
||||
@ -1039,10 +1042,17 @@ export default {
|
||||
this.handleGoShop();
|
||||
}
|
||||
} else if (obj.value === 17) {
|
||||
if (obj.index === 0) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/shopMallPage/shopType/index`,
|
||||
});
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: `/pages/highwayHeadlines/attractInvestment`,
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
// 跳转到商城
|
||||
handleGoShop() {
|
||||
|
||||
@ -192,7 +192,7 @@
|
||||
<div class="advertisement" :style="{
|
||||
background: pageType !== 'UnionMall' ? '#fff' : 'transparent',
|
||||
}">
|
||||
<div class="advertisementContentBox" v-if="pageType !== 'UnionMall'" @click="handleGoShopList(4597)">
|
||||
<div class="advertisementContentBox" v-if="pageType !== 'UnionMall'" @click="handleGoShopList(4597, 0)">
|
||||
<div class="advertisementTop">
|
||||
<div class="title">
|
||||
每周特惠
|
||||
@ -233,13 +233,15 @@
|
||||
<div class="advertisement" :style="{
|
||||
background: pageType !== 'UnionMall' ? '#fff' : 'transparent',
|
||||
}">
|
||||
<div class="advertisementContentBox" v-if="pageType !== 'UnionMall'" @click="handleGoShopList(5030)">
|
||||
<div class="advertisementContentBox" v-if="pageType !== 'UnionMall'" @click="handleGoShopList(3186, 1)">
|
||||
<div class="advertisementTop">
|
||||
<div class="title">
|
||||
<image class="titleImg" src="https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/title1st.png" />
|
||||
绿色云品
|
||||
<!-- <image class="titleImg" src="https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/title1st.png" /> -->
|
||||
</div>
|
||||
<div class="moreBox">
|
||||
<text class="moreText">低价爆品天天有</text>
|
||||
<!-- <text class="moreText">低价爆品天天有</text> -->
|
||||
<text class="moreText">更多</text>
|
||||
<image class="rightIcon" src="https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/rightArrow.png" />
|
||||
</div>
|
||||
</div>
|
||||
@ -348,11 +350,12 @@
|
||||
|
||||
<!-- 今日推荐 -->
|
||||
<div class="advertisementSecond">
|
||||
<div class="advertisementItem" @click="handleGoShopList(5050)" v-if="pageType !== 'UnionMall'">
|
||||
<div class="advertisementItem" @click="handleGoShopList(3175, 2)" v-if="pageType !== 'UnionMall'">
|
||||
<div class="advertisementItemContent">
|
||||
<div class="contentTop">
|
||||
<div class="title">
|
||||
<image class="titleImg" src="https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/today3st.png" />
|
||||
自有品牌
|
||||
<!-- <image class="titleImg" src="https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/today3st.png" /> -->
|
||||
</div>
|
||||
<div class="moreBox">
|
||||
<text class="moreText">更多</text>
|
||||
@ -360,7 +363,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="shopDesc">精品优选</div>
|
||||
<!-- <div class="shopDesc">精品优选</div> -->
|
||||
|
||||
<scroll-view class="shopItemList" scroll-x>
|
||||
<div :style="{
|
||||
@ -408,20 +411,18 @@
|
||||
<!-- 甄选商品 -->
|
||||
<div class="allShopList">
|
||||
<template v-if="pageType !== 'UnionMall'">
|
||||
<scroll-view class="allTypeBox" scroll-x="true">
|
||||
<!-- <div :class="selectProducts === item.USERDEFINEDTYPE_ID
|
||||
? 'typeItem selectTypeItem'
|
||||
: 'typeItem'
|
||||
" v-for="(item, index) in productsList" :key="index" @click="handleChangeShopMallType(item)">
|
||||
{{ item.USERDEFINEDTYPE_NAME }}
|
||||
</div> -->
|
||||
<view class="allShopTitle">积分商城</view>
|
||||
<view class="jfDescBox">
|
||||
<image mode="widthFix" class="descImg" src="https://eshangtech.com/ShopICO/ahyd-mall/descImg.png" />
|
||||
</view>
|
||||
<!-- <scroll-view class="allTypeBox" scroll-x="true">
|
||||
<div :class="selectProducts === item.UserdefinedType_Id
|
||||
? 'typeItem selectTypeItem'
|
||||
: 'typeItem'
|
||||
" v-for="(item, index) in shopTypeList" :key="index" @click="handleChangeShopMallType(item)">
|
||||
{{ item.UserdefinedType_Name }}
|
||||
</div>
|
||||
</scroll-view>
|
||||
</scroll-view> -->
|
||||
|
||||
<!-- <scroll-view class="allShopListContent" scroll-y="true" @scrolltolower="handleToBottomproductsList">
|
||||
<view class="buyShopItem" v-for="(item, index) in productsList" :key="index"
|
||||
@ -888,9 +889,9 @@ export default {
|
||||
// const data3 = await this.$api.getCoop(req3);
|
||||
|
||||
|
||||
const data1 = await this.$api.$javaGet('/third-party/getExcludeWeChatGetMallGoodsInfo', req1)
|
||||
const data2 = await this.$api.$javaGet('/third-party/getExcludeWeChatGetMallGoodsInfo', req2)
|
||||
const data3 = await this.$api.$javaGet('/third-party/getExcludeWeChatGetMallGoodsInfo', req3)
|
||||
const data1 = await this.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', req1)
|
||||
const data2 = await this.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', req2)
|
||||
const data3 = await this.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', req3)
|
||||
|
||||
let list1 = this.handleChangeShopList(data1.Data.List);
|
||||
let list2 = this.handleChangeShopList(data2.Data.List);
|
||||
@ -1143,9 +1144,11 @@ export default {
|
||||
// justCommodity: 1,
|
||||
// });
|
||||
|
||||
// let url = this.pageType === "UnionMall" ? '/third-party/getWeChatGetMallGoodsInfo' : '/third-party/getWeChatGetMallGoodsInfoExclude'
|
||||
|
||||
const data = await this.$api.$javaGet(
|
||||
'/third-party/getExcludeWeChatGetMallGoodsInfo',
|
||||
'/third-party/getWeChatGetMallGoodsInfoExclude',
|
||||
// url,
|
||||
{
|
||||
ownerUnitId: 911,
|
||||
userdefinedTypeId: 1355,
|
||||
@ -1154,9 +1157,6 @@ export default {
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
console.log("handleGetActivityList", data);
|
||||
let list = data.Data.List;
|
||||
let res = [];
|
||||
@ -1192,11 +1192,17 @@ export default {
|
||||
// justCommodity: 1,
|
||||
// });
|
||||
|
||||
let url = this.pageType === "UnionMall" ? '/third-party/getWeChatGetMallGoodsInfo' : '/third-party/getWeChatGetMallGoodsInfoExclude'
|
||||
|
||||
const data = await this.$api.$javaGet(
|
||||
'/third-party/getExcludeWeChatGetMallGoodsInfo',
|
||||
// '/third-party/getExcludeWeChatGetMallGoodsInfo',
|
||||
url,
|
||||
{
|
||||
ownerUnitId: 911,
|
||||
COMMODITYNATURE: 5030,
|
||||
// COMMODITYNATURE: 5030,//特价优惠
|
||||
COMMODITYNATURE: 5021,// 绿色云品
|
||||
userdefinedTypeId: 3186,// 绿色云品
|
||||
userdefinedtypeId: 3186,// 绿色云品
|
||||
excludeNature: 5070,
|
||||
justCommodity: 1,
|
||||
}
|
||||
@ -1205,10 +1211,14 @@ export default {
|
||||
console.log("handleGetSpecialOffers", data);
|
||||
let list = data.Data && data.Data.List ? data.Data.List : [];
|
||||
let shopList = [];
|
||||
let shopIdList = []
|
||||
if (list && list.length > 0) {
|
||||
list.forEach((item) => {
|
||||
if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
|
||||
item.COMMODITYLIST.forEach((subItem) => {
|
||||
if (shopIdList.indexOf(subItem.COMMODITY_ID) === -1) {
|
||||
shopIdList.push(subItem.COMMODITY_ID)
|
||||
|
||||
if (
|
||||
subItem.COMMODITY_MEMBERPRICE &&
|
||||
subItem.COMMODITY_MEMBERPRICE.toString().indexOf(".") !== -1
|
||||
@ -1232,6 +1242,8 @@ export default {
|
||||
subItem.RETbigNumber = subItem.COMMODITY_RETAILPRICE;
|
||||
}
|
||||
shopList.push(subItem);
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
});
|
||||
@ -1308,11 +1320,18 @@ export default {
|
||||
// justCommodity: 1,
|
||||
// });
|
||||
|
||||
|
||||
// let url = this.pageType === "UnionMall" ? '/third-party/getWeChatGetMallGoodsInfo' : '/third-party/getWeChatGetMallGoodsInfoExclude'
|
||||
|
||||
const data = await this.$api.$javaGet(
|
||||
'/third-party/getExcludeWeChatGetMallGoodsInfo',
|
||||
'/third-party/getWeChatGetMallGoodsInfoExclude',
|
||||
// url,
|
||||
{
|
||||
ownerUnitId: 911,
|
||||
COMMODITYNATURE: 4598,
|
||||
// COMMODITYNATURE: 4598,// 原今日推荐
|
||||
COMMODITYNATURE: 5022,//自有品牌
|
||||
userdefinedtypeId: 3175, // 商品分类
|
||||
userdefinedTypeId: 3175, // 商品分类
|
||||
excludeNature: 5070,
|
||||
justCommodity: 1,
|
||||
}
|
||||
@ -1321,10 +1340,13 @@ export default {
|
||||
console.log("今日推荐", data);
|
||||
let list = data.Data.List;
|
||||
let shopList = [];
|
||||
let shopIdList = []
|
||||
if (list && list.length > 0) {
|
||||
list.forEach((item) => {
|
||||
if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
|
||||
item.COMMODITYLIST.forEach((subItem) => {
|
||||
if (shopIdList.indexOf(subItem.COMMODITY_ID) === -1) {
|
||||
shopIdList.push(subItem.COMMODITY_ID)
|
||||
if (
|
||||
subItem.COMMODITY_MEMBERPRICE &&
|
||||
subItem.COMMODITY_MEMBERPRICE.toString().indexOf(".") !== -1
|
||||
@ -1348,6 +1370,10 @@ export default {
|
||||
subItem.RETbigNumber = subItem.COMMODITY_RETAILPRICE;
|
||||
}
|
||||
shopList.push(subItem);
|
||||
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
});
|
||||
@ -1404,20 +1430,40 @@ export default {
|
||||
// // excludeNature: 5070,
|
||||
// });
|
||||
|
||||
// 原本下面商城的内容
|
||||
|
||||
// const data = await this.$api.$javaGet(
|
||||
// '/third-party/getWeChatGetMallGoodsInfo',
|
||||
// {
|
||||
// ownerUnitId: 911,
|
||||
// COMMODITYNATURE: this.selectProducts === 4597 ? '' : 3000,
|
||||
// userdefinedTypeId: this.selectProducts || "",
|
||||
// Page_Size: this.shopMsg.pageSize,
|
||||
// Page_Index: this.shopMsg.pageIndex,
|
||||
// justCommodity: 1,
|
||||
// }
|
||||
// )
|
||||
|
||||
//
|
||||
|
||||
const data = await this.$api.$javaGet(
|
||||
'/third-party/getExcludeWeChatGetMallGoodsInfo',
|
||||
'/third-party/getWeChatGetMallGoodsInfo',
|
||||
{
|
||||
ownerUnitId: 911,
|
||||
COMMODITYNATURE: this.selectProducts === 4597 ? '' : 3000,
|
||||
userdefinedTypeId: this.selectProducts || "",
|
||||
Page_Size: this.shopMsg.pageSize,
|
||||
Page_Index: this.shopMsg.pageIndex,
|
||||
justCommodity: 1,
|
||||
payMethod: "2000,3000",
|
||||
COMMODITYNATURE: 6000
|
||||
// COMMODITYNATURE: this.selectProducts === 4597 ? '' : 3000,
|
||||
// userdefinedTypeId: this.selectProducts || "",
|
||||
// Page_Size: this.shopMsg.pageSize,
|
||||
// Page_Index: this.shopMsg.pageIndex,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
let list = data.Data.List;
|
||||
console.log('积分商城', list);
|
||||
|
||||
let resList = [];
|
||||
let thisResList = [];
|
||||
if (this.shopMsg.pageIndex > 1) {
|
||||
@ -1461,7 +1507,7 @@ export default {
|
||||
}
|
||||
// this.productsList = list;
|
||||
this.productsList = resList.concat(thisResList);
|
||||
console.log("甄选商品", list);
|
||||
console.log("甄选商品", this.productsList);
|
||||
uni.hideLoading();
|
||||
|
||||
// let shopList = []
|
||||
@ -1494,10 +1540,13 @@ export default {
|
||||
});
|
||||
},
|
||||
// 跳转商品列表接口
|
||||
handleGoShopList(type) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/shopPages/shopList/index?type=${type}&pageType=${this.pageType || ""
|
||||
}`,
|
||||
handleGoShopList(value, index) {
|
||||
// uni.navigateTo({
|
||||
// url: `/pages/shopPages/shopList/index?type=${type}&pageType=${this.pageType || ""
|
||||
// }`,
|
||||
// });
|
||||
uni.redirectTo({
|
||||
url: `/pages/shopMallPage/shopType/index?leftId=${value}&pageType=${this.pageType}&selectIndex=${index}`,
|
||||
});
|
||||
},
|
||||
// 跳转商品详情
|
||||
@ -2266,6 +2315,10 @@ export default {
|
||||
justify-content: space-between;
|
||||
|
||||
.title {
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
color: #181716;
|
||||
|
||||
.titleImg {
|
||||
width: 112rpx;
|
||||
height: 36rpx;
|
||||
@ -2444,6 +2497,22 @@ export default {
|
||||
width: 100%;
|
||||
margin-top: 40rpx;
|
||||
|
||||
.allShopTitle {
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
color: #181716;
|
||||
}
|
||||
|
||||
.jfDescBox {
|
||||
width: 100%;
|
||||
margin-top: 24rpx;
|
||||
|
||||
.descImg {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.allTypeBox {
|
||||
width: calc(100vw - 48rpx);
|
||||
height: 60rpx;
|
||||
|
||||
@ -629,7 +629,7 @@ export default {
|
||||
// // justCommodity: 1,
|
||||
// });
|
||||
|
||||
let url = this.pageType === "UnionMall" ? '/third-party/getExcludeWeChatGetMallGoodsInfo' : '/third-party/getWeChatGetMallGoodsInfoExclude'
|
||||
let url = this.pageType === "UnionMall" ? '/third-party/getWeChatGetMallGoodsInfo' : '/third-party/getWeChatGetMallGoodsInfoExclude'
|
||||
|
||||
const data = await this.$api.$javaGet(
|
||||
// '/third-party/getExcludeWeChatGetMallGoodsInfo',
|
||||
@ -638,8 +638,8 @@ export default {
|
||||
ownerUnitId: 911,
|
||||
appId: "wxee018fb96955552a",
|
||||
commodityName: this.searchText,
|
||||
excludeNature: this.pageType === "UnionMall" ? null : 5070,
|
||||
commodityNature: this.pageType === "UnionMall" ? 5070 : null,
|
||||
excludeNature: this.pageType === "UnionMall" ? "" : 5070,
|
||||
commodityNature: this.pageType === "UnionMall" ? 5070 : "",
|
||||
payMethod: "1000,3000",
|
||||
// justCommodity: 1,
|
||||
}
|
||||
@ -791,8 +791,10 @@ export default {
|
||||
// // justCommodity: 1,
|
||||
// });
|
||||
|
||||
let url = this.pageType === "UnionMall" ? '/third-party/getWeChatGetMallGoodsInfo' : '/third-party/getWeChatGetMallGoodsInfoExclude'
|
||||
const data = await this.$api.$javaGet(
|
||||
'/third-party/getExcludeWeChatGetMallGoodsInfo',
|
||||
// '/third-party/getExcludeWeChatGetMallGoodsInfo',
|
||||
url,
|
||||
{
|
||||
ownerUnitId: 911,
|
||||
userdefinedTypeId: this.searchText ? "" : id,
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
<template>
|
||||
<scroll-view class="page-body" scroll-y="true" @scroll="handlePageScroll" :scroll-into-view="scrollView">
|
||||
<div>
|
||||
<scroll-view class="page-body" scroll-y="true" @scroll="handlePageScroll" :scroll-into-view="scrollView" :style="{
|
||||
paddingBottom: `${134 + (isCountdown || panicBuying ? 64 : 0)}rpx`
|
||||
}">
|
||||
<div class="product-image" :style="{
|
||||
marginTop: menu.top - 4 + 'px',
|
||||
width: '100vw',
|
||||
@ -17,8 +20,10 @@
|
||||
</view>
|
||||
|
||||
<view class="tabBox" v-if="showTopFixed">
|
||||
<view @click="handleChangePageTab(1)" :class="pageTab === 1 ? 'tabItem selectTabItem' : 'tabItem'">商品</view>
|
||||
<view @click="handleChangePageTab(2)" :class="pageTab === 2 ? 'tabItem selectTabItem' : 'tabItem'">详情</view>
|
||||
<view @click="handleChangePageTab(1)" :class="pageTab === 1 ? 'tabItem selectTabItem' : 'tabItem'">商品
|
||||
</view>
|
||||
<view @click="handleChangePageTab(2)" :class="pageTab === 2 ? 'tabItem selectTabItem' : 'tabItem'">详情
|
||||
</view>
|
||||
</view>
|
||||
<view class="rightContent"></view>
|
||||
|
||||
@ -48,7 +53,8 @@
|
||||
backgroundSize: '100% 100%',
|
||||
}"
|
||||
></view> -->
|
||||
<image mode="aspectFill" lazy-load="true" :src="img.IMAGE_URL" @click="handlePreviewSwiper(img, i)"></image>
|
||||
<image mode="aspectFill" lazy-load="true" :src="img.IMAGE_URL" @click="handlePreviewSwiper(img, i)">
|
||||
</image>
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
<!-- <div class="swiper-dots" v-if="pageMsg.imgeCount > 0">
|
||||
@ -243,68 +249,7 @@
|
||||
</div>
|
||||
</block>
|
||||
|
||||
<div class="product-btn-box">
|
||||
<view class="leftBtn">
|
||||
<view class="btnItem" @click="handleBackIndex">
|
||||
<image class="btnItemImg" src="https://eshangtech.com/ShopICO/shoppingMall/home.png" />
|
||||
<text class="btnItemText">首页</text>
|
||||
</view>
|
||||
<!-- <view class="btnItem">
|
||||
<image class="btnItemImg" src="/static/images/home/collect.svg" />
|
||||
<text class="btnItemText">收藏</text>
|
||||
</view> -->
|
||||
<view class="btnItem" @click="handleShowShopCar">
|
||||
<image class="btnItemImg" src="/static/images/home/shopCarIcon.svg" />
|
||||
<text class="btnItemText">购物车</text>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="home-btn" url="/pages/home/index" open-type="switchTab"
|
||||
>首页</view
|
||||
> -->
|
||||
<view class="rightBtn">
|
||||
<div class="addCarBtn" @click="handleShowShopPopup(1)">加入购物车</div>
|
||||
<div class="sellOut presale" @click="handleShowShopPopup(4)" v-if="isCountdown">
|
||||
预售中
|
||||
</div>
|
||||
<div class="addOrder" @click="handleShowShopPopup(2)"
|
||||
v-if="good.OFF_DATE && !isCountdown ? new Date().getTime() < new Date(good.OFF_DATE).getTime() : (good.COMMODITY_STOCK > 0 && !isCountdown)">
|
||||
立即购买
|
||||
</div>
|
||||
<div class="sellOut" @click="handleShowShopPopup(3)" v-if="good.COMMODITY_STOCK === 0 && !isCountdown">
|
||||
已售罄
|
||||
</div>
|
||||
<div class="sellOut" @click="handleShowShopPopup(3)"
|
||||
v-if="new Date().getTime() > new Date(good.OFF_DATE).getTime()">
|
||||
已结束
|
||||
</div>
|
||||
</view>
|
||||
<!-- <div
|
||||
class="buynow-btn"
|
||||
@click="getMemberPoint(1)"
|
||||
v-if="good.COMMODITY_STOCK > 0 && good.PAY_METHOD !== 1000"
|
||||
>
|
||||
立即兑换
|
||||
</div>
|
||||
<div
|
||||
class="join-shopCart"
|
||||
@click="getMemberPoint(2)"
|
||||
v-if="good.COMMODITY_STOCK > 0 && good.PAY_METHOD !== 2000"
|
||||
>
|
||||
立即购买
|
||||
</div>
|
||||
<div
|
||||
class="buynow-btn"
|
||||
style="background: #eee; color: #999"
|
||||
v-if="good.COMMODITY_STOCK < 1"
|
||||
>
|
||||
已售罄
|
||||
</div> -->
|
||||
</div>
|
||||
|
||||
<!-- 预售倒计时 -->
|
||||
<div class="countdown" v-if="isCountdown || panicBuying">
|
||||
此商品为{{ panicBuying ? '热销' : '预售' }}商品，{{ panicBuying ? '抢购' : '起售' }}倒计时 {{ countdown || "" }}
|
||||
</div>
|
||||
|
||||
<uni-popup :show="showShareBox" position="bottom" overlay="false" @close="handleClosePopup" ref="popup"
|
||||
:safe-area="false">
|
||||
@ -344,6 +289,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<scroll-view :scroll-y="true" class="scrollDetailBox">
|
||||
<div class="detailMessage">
|
||||
<p class="detailTitle">详细信息</p>
|
||||
<text class="detailText"></text>
|
||||
@ -366,8 +312,25 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="sizeBox">
|
||||
<div class="sizeTitle">规格</div>
|
||||
<scroll-view :scroll-x="true" :scroll-y="true" class="sizeScrollBox">
|
||||
<div class="sizeList">
|
||||
<div :class="good.RTCOMMODITY_MULTI_ID === item.RTCOMMODITY_MULTI_ID
|
||||
? 'sizeItem selectSizeItem'
|
||||
: 'sizeItem'
|
||||
" :style="{
|
||||
background: item.COMMODITY_STOCK > 0 ? good.RTCOMMODITY_MULTI_ID === item.RTCOMMODITY_MULTI_ID ? '#e7f3ff' : '#dbdad6' : '#9c9c9a0',
|
||||
color: item.COMMODITY_STOCK > 0 ? good.RTCOMMODITY_MULTI_ID === item.RTCOMMODITY_MULTI_ID ? '#1890ff' : '#000' : '#a4a4a4'
|
||||
}" v-for="(item, index) in good.SKULIST" :key="index"
|
||||
@click="handleChangeSelectSKULIST(item.RTCOMMODITY_MULTI_ID, item)">
|
||||
{{ item.COMMODITY_NAME }}
|
||||
</div>
|
||||
<!-- <div class="sizeItem">{{ good.COMMODITY_UNIT }}</div> -->
|
||||
</div>
|
||||
</scroll-view>
|
||||
</div>
|
||||
<!-- <div class="sizeBox">
|
||||
<text class="sizeTitle">规格</text>
|
||||
<div class="sizeList">
|
||||
<div :class="good.COMMODITY_RULE === item.COMMODITY_MULTI_ID
|
||||
@ -377,14 +340,14 @@
|
||||
@click="handleChangeSelectSKULIST(item.COMMODITY_MULTI_ID)">
|
||||
{{ item.COMMODITY_NAME }}
|
||||
</div>
|
||||
<!-- <div class="sizeItem">{{ good.COMMODITY_UNIT }}</div> -->
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<div class="descBox">
|
||||
<input class="desc" :value="good.SALEDETAIL_DESC" placeholder="请填写商品备注"
|
||||
@input="handleDesc($event, good)" />
|
||||
</div>
|
||||
</div>
|
||||
</scroll-view>
|
||||
</view>
|
||||
|
||||
<view class="bottomBtn">
|
||||
@ -394,6 +357,70 @@
|
||||
</view>
|
||||
</uni-popup>
|
||||
</scroll-view>
|
||||
|
||||
<div class="product-btn-box">
|
||||
<view class="leftBtn">
|
||||
<view class="btnItem" @click="handleBackIndex">
|
||||
<image class="btnItemImg" src="https://eshangtech.com/ShopICO/shoppingMall/home.png" />
|
||||
<text class="btnItemText">首页</text>
|
||||
</view>
|
||||
<!-- <view class="btnItem">
|
||||
<image class="btnItemImg" src="/static/images/home/collect.svg" />
|
||||
<text class="btnItemText">收藏</text>
|
||||
</view> -->
|
||||
<view class="btnItem" @click="handleShowShopCar">
|
||||
<image class="btnItemImg" src="/static/images/home/shopCarIcon.svg" />
|
||||
<text class="btnItemText">购物车</text>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="home-btn" url="/pages/home/index" open-type="switchTab"
|
||||
>首页</view
|
||||
> -->
|
||||
<view class="rightBtn">
|
||||
<div class="addCarBtn" @click="handleShowShopPopup(1)">加入购物车</div>
|
||||
<div class="sellOut presale" @click="handleShowShopPopup(4)" v-if="isCountdown">
|
||||
预售中
|
||||
</div>
|
||||
<div class="addOrder" @click="handleShowShopPopup(2)"
|
||||
v-if="good.OFF_DATE && !isCountdown ? new Date().getTime() < new Date(good.OFF_DATE).getTime() : (good.COMMODITY_STOCK > 0 && !isCountdown)">
|
||||
立即购买
|
||||
</div>
|
||||
<div class="sellOut" @click="handleShowShopPopup(3)" v-if="good.COMMODITY_STOCK === 0 && !isCountdown">
|
||||
已售罄
|
||||
</div>
|
||||
<div class="sellOut" @click="handleShowShopPopup(3)"
|
||||
v-if="new Date().getTime() > new Date(good.OFF_DATE).getTime() && !(good.OFF_DATE && !isCountdown)">
|
||||
已结束
|
||||
</div>
|
||||
</view>
|
||||
<!-- <div
|
||||
class="buynow-btn"
|
||||
@click="getMemberPoint(1)"
|
||||
v-if="good.COMMODITY_STOCK > 0 && good.PAY_METHOD !== 1000"
|
||||
>
|
||||
立即兑换
|
||||
</div>
|
||||
<div
|
||||
class="join-shopCart"
|
||||
@click="getMemberPoint(2)"
|
||||
v-if="good.COMMODITY_STOCK > 0 && good.PAY_METHOD !== 2000"
|
||||
>
|
||||
立即购买
|
||||
</div>
|
||||
<div
|
||||
class="buynow-btn"
|
||||
style="background: #eee; color: #999"
|
||||
v-if="good.COMMODITY_STOCK < 1"
|
||||
>
|
||||
已售罄
|
||||
</div> -->
|
||||
</div>
|
||||
|
||||
<!-- 预售倒计时 -->
|
||||
<div class="countdown" v-if="isCountdown || panicBuying">
|
||||
此商品为{{ panicBuying ? '热销' : '预售' }}商品，{{ panicBuying ? '抢购' : '起售' }}倒计时 {{ countdown || "" }}
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
// import rateItem from "../../rate/components/rateItem";
|
||||
@ -402,6 +429,7 @@ export default {
|
||||
data() {
|
||||
const windows = uni.getSystemInfoSync();
|
||||
return {
|
||||
safeHeight: 0,
|
||||
pageMsg: {
|
||||
current: 0,
|
||||
imgeCount: 0,
|
||||
@ -1385,6 +1413,9 @@ export default {
|
||||
clearInterval(this.timer);
|
||||
},
|
||||
onLoad(option) {
|
||||
let systemInfo = uni.getSystemInfoSync();
|
||||
let height = systemInfo.safeAreaInsets.bottom;
|
||||
this.safeHeight = Number(height);
|
||||
this.menu = uni.getMenuButtonBoundingClientRect();
|
||||
console.log("option", option);
|
||||
if (option.pageType) {
|
||||
@ -1876,7 +1907,7 @@ button:after {
|
||||
align-items: center;
|
||||
text-align: center;
|
||||
justify-content: space-between;
|
||||
z-index: 1;
|
||||
z-index: 2;
|
||||
box-sizing: border-box;
|
||||
padding-bottom: 24rpx;
|
||||
background: #fff;
|
||||
@ -2038,6 +2069,7 @@ button:after {
|
||||
height: 64rpx;
|
||||
background: #fff2e7;
|
||||
position: fixed;
|
||||
z-index: 2;
|
||||
left: 0;
|
||||
bottom: 124rpx;
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
@ -2059,7 +2091,7 @@ button:after {
|
||||
|
||||
.shopPopupBox {
|
||||
width: 100%;
|
||||
height: 70vh;
|
||||
height: 80vh;
|
||||
background: #fff;
|
||||
border-radius: 16rpx 16rpx 0 0;
|
||||
box-sizing: border-box;
|
||||
@ -2067,7 +2099,7 @@ button:after {
|
||||
|
||||
.shopPopupContent {
|
||||
width: 100%;
|
||||
height: calc(70vh - 92rpx - 64rpx);
|
||||
height: calc(80vh - 80px - 32px + 12rpx);
|
||||
margin-bottom: 12rpx;
|
||||
|
||||
.detailTop {
|
||||
@ -2141,6 +2173,10 @@ button:after {
|
||||
}
|
||||
}
|
||||
|
||||
.scrollDetailBox {
|
||||
width: 100%;
|
||||
height: calc(80vh - 80px - 32px + 12rpx - 80px);
|
||||
|
||||
.detailMessage {
|
||||
margin-top: 16px;
|
||||
border-bottom: 1px solid #f2f4f5;
|
||||
@ -2225,21 +2261,29 @@ button:after {
|
||||
}
|
||||
|
||||
.sizeBox {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-top: 12px;
|
||||
|
||||
.sizeTitle {
|
||||
display: inline-block;
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #020e1a;
|
||||
line-height: 20px;
|
||||
width: 100rpx;
|
||||
}
|
||||
|
||||
.sizeScrollBox {
|
||||
width: calc(100% - 112rpx);
|
||||
flex: 1;
|
||||
|
||||
.sizeList {
|
||||
display: flex;
|
||||
// display: flex;
|
||||
width: 100%;
|
||||
|
||||
.sizeItem {
|
||||
font-size: 12px;
|
||||
@ -2251,9 +2295,12 @@ button:after {
|
||||
background: #dbdad6;
|
||||
border-radius: 4px;
|
||||
margin-left: 8px;
|
||||
display: inline-block;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
|
||||
.selectSizeItem {
|
||||
display: inline-block;
|
||||
font-size: 12px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
@ -2263,8 +2310,11 @@ button:after {
|
||||
background: #e7f3ff;
|
||||
border-radius: 4px;
|
||||
margin-left: 8px;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.descBox {
|
||||
@ -2293,6 +2343,8 @@ button:after {
|
||||
margin-top: 24px;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.bottomBtn {
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -202,6 +202,7 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
|
||||
var _default = {
|
||||
data: function data() {
|
||||
return {
|
||||
safeHeight: "",
|
||||
detailObj: {
|
||||
// NOTICEINFO_TITLE: "",
|
||||
// START_DATE: "",
|
||||
@ -213,7 +214,9 @@ var _default = {
|
||||
};
|
||||
},
|
||||
onLoad: function onLoad(query) {
|
||||
console.log("query", query);
|
||||
var systemInfo = uni.getSystemInfoSync();
|
||||
var height = systemInfo.safeAreaInsets.bottom;
|
||||
this.safeHeight = Number(height);
|
||||
if (query.id) {
|
||||
this.id = query.id;
|
||||
if (query.type === 'true') {
|
||||
|
||||
@ -1 +1 @@
|
||||
<view class="main _div data-v-24542bf6"><block wx:if="{{showType===1}}"><view class="_div data-v-24542bf6"><view class="pageTitle _div data-v-24542bf6">{{detailObj.NOTICEINFO_TITLE||""}}</view><view class="time _div data-v-24542bf6">{{detailObj.START_DATE||"-"}}</view><block wx:if="{{$root.g0}}"><view class="navList _div data-v-24542bf6"><block wx:if="{{$root.g1}}"><swiper class="swiper data-v-24542bf6" circular="{{true}}" indicator-dots="{{$root.g2?true:false}}" autoplay="{{true}}" indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#ffffff"><block wx:for="{{detailObj.ImageList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['handleShowPreview',['$0'],['detailObj.ImageList.__$n0.ImageUrl']]]]]}}" bindtap="__e" class="data-v-24542bf6"><view class="swiper-item data-v-24542bf6" style="{{'background-image:'+('url('+item.ImageUrl+')')+';'}}"></view></swiper-item></block></swiper></block></view></block><text class="content data-v-24542bf6">{{detailObj.NOTICEINFO_CONTENT||""}}</text></view></block><block wx:if="{{detailObj.content&&showType===2}}"><view class="newContent _div data-v-24542bf6"><rich-text nodes="{{detailObj.content}}"></rich-text></view></block></view>
|
||||
<view class="main _div data-v-24542bf6" style="{{'padding-bottom:'+(safeHeight+'px')+';'}}"><block wx:if="{{showType===1}}"><view class="_div data-v-24542bf6"><view class="pageTitle _div data-v-24542bf6">{{detailObj.NOTICEINFO_TITLE||""}}</view><view class="time _div data-v-24542bf6">{{detailObj.START_DATE||"-"}}</view><block wx:if="{{$root.g0}}"><view class="navList _div data-v-24542bf6"><block wx:if="{{$root.g1}}"><swiper class="swiper data-v-24542bf6" circular="{{true}}" indicator-dots="{{$root.g2?true:false}}" autoplay="{{true}}" indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#ffffff"><block wx:for="{{detailObj.ImageList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['handleShowPreview',['$0'],['detailObj.ImageList.__$n0.ImageUrl']]]]]}}" bindtap="__e" class="data-v-24542bf6"><view class="swiper-item data-v-24542bf6" style="{{'background-image:'+('url('+item.ImageUrl+')')+';'}}"></view></swiper-item></block></swiper></block></view></block><text class="content data-v-24542bf6">{{detailObj.NOTICEINFO_CONTENT||""}}</text></view></block><block wx:if="{{detailObj.content&&showType===2}}"><view class="newContent _div data-v-24542bf6"><rich-text nodes="{{detailObj.content}}"></rich-text></view></block></view>
|
||||
@ -1 +1 @@
|
||||
<view class="main _div data-v-765f0f4e"><view class="tabBox _div data-v-765f0f4e"><block wx:for="{{tabList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleChangeTab',['$0'],[[['tabList','',index,'value']]]]]]]}}" class="{{['_div','data-v-765f0f4e',selectTab===item.value?'tabItem selectTabItem':'tabItem']}}" bindtap="__e">{{''+item.label+''}}</view></block></view><view class="contentList _div data-v-765f0f4e"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleGoDetail',['$0'],[[['allMessageList.'+selectTab+'','',index]]]]]]]}}" class="contentItem _div data-v-765f0f4e" bindtap="__e"><view class="left _div data-v-765f0f4e"><view class="title _div data-v-765f0f4e">{{item.$orig.title||item.$orig.NOTICEINFO_TITLE||""}}</view><view class="content _div data-v-765f0f4e">{{item.$orig.NOTICEINFO_CONTENT||""}}</view><view class="descBox _div data-v-765f0f4e"><label class="name _span data-v-765f0f4e">{{item.$orig.author||item.$orig.STAFF_NAME||"-"}}</label><label class="time _span data-v-765f0f4e">{{item.$orig.publishTime||item.$orig.START_DATE||"-"}}</label></view></view><view class="right _div data-v-765f0f4e"><block wx:if="{{item.g0}}"><image class="leftIcon data-v-765f0f4e" src="{{item.$orig.ImageList[0].ImageUrl}}"></image></block><block wx:else><image class="leftIcon data-v-765f0f4e" src="{{item.$orig.coverImg?item.$orig.coverImg:'https://eshangtech.com/ShopICO/no-picture.png'}}"></image></block></view></view></block><block wx:if="{{!$root.g1}}"><view class="_div data-v-765f0f4e"><no-data vue-id="55835b78-1" text="暂无内容" class="data-v-765f0f4e" bind:__l="__l"></no-data></view></block></view></view>
|
||||
<view class="main _div data-v-765f0f4e"><view class="tabBox _div data-v-765f0f4e"><block wx:for="{{tabList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleChangeTab',['$0'],[[['tabList','',index,'value']]]]]]]}}" class="{{['_div','data-v-765f0f4e',selectTab===item.value?'tabItem selectTabItem':'tabItem']}}" bindtap="__e">{{''+item.label+''}}</view></block></view><scroll-view class="contentList data-v-765f0f4e" scroll-y="{{true}}"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleGoDetail',['$0'],[[['allMessageList.'+selectTab+'','',index]]]]]]]}}" class="contentItem _div data-v-765f0f4e" bindtap="__e"><view class="left _div data-v-765f0f4e"><view class="title _div data-v-765f0f4e">{{item.$orig.title||item.$orig.NOTICEINFO_TITLE||""}}</view><view class="content _div data-v-765f0f4e">{{item.$orig.NOTICEINFO_CONTENT||""}}</view><view class="descBox _div data-v-765f0f4e"><label class="name _span data-v-765f0f4e">{{item.$orig.author||item.$orig.STAFF_NAME||"-"}}</label><label class="time _span data-v-765f0f4e">{{item.$orig.publishTime||item.$orig.START_DATE||"-"}}</label></view></view><view class="right _div data-v-765f0f4e"><block wx:if="{{item.g0}}"><image class="leftIcon data-v-765f0f4e" src="{{item.$orig.ImageList[0].ImageUrl}}"></image></block><block wx:else><image class="leftIcon data-v-765f0f4e" src="{{item.$orig.coverImg?item.$orig.coverImg:'https://eshangtech.com/ShopICO/no-picture.png'}}"></image></block></view></view></block><block wx:if="{{!$root.g1}}"><view class="_div data-v-765f0f4e"><no-data vue-id="55835b78-1" text="暂无内容" class="data-v-765f0f4e" bind:__l="__l"></no-data></view></block></scroll-view></view>
|
||||
@ -46,8 +46,7 @@
|
||||
}
|
||||
.main .contentList.data-v-765f0f4e {
|
||||
width: 100%;
|
||||
height: calc(100vh - 50px);
|
||||
overflow-y: auto;
|
||||
height: calc(100vh - 70px);
|
||||
}
|
||||
.main .contentList .contentItem.data-v-765f0f4e {
|
||||
width: 100%;
|
||||
|
||||
@ -317,8 +317,12 @@ var _default = {
|
||||
},
|
||||
pageType: "",
|
||||
// spring 春节模式
|
||||
swiperList: ["https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区_1.jpg"],
|
||||
previewImageList: ["https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正太泰国榴莲.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区.jpg"],
|
||||
swiperList: [
|
||||
// "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg",
|
||||
"http://saas.eshangtech.com/minTestImg/正大泰国榴莲.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区_1.jpg"],
|
||||
previewImageList: [
|
||||
// "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg",
|
||||
"http://saas.eshangtech.com/minTestImg/正大泰国榴莲.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正太泰国榴莲.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区.jpg"],
|
||||
// 预览图数组
|
||||
roadStatusList: [],
|
||||
// 路况播报
|
||||
@ -367,7 +371,7 @@ var _default = {
|
||||
_this = _this2;
|
||||
setTimeout(function () {
|
||||
_this.$refs.noticeRef.close();
|
||||
}, 5000);
|
||||
}, 8000);
|
||||
} else {
|
||||
_this2.showPoster = false;
|
||||
}
|
||||
@ -969,10 +973,16 @@ var _default = {
|
||||
this.handleGoShop();
|
||||
}
|
||||
} else if (obj.value === 17) {
|
||||
if (obj.index === 0) {
|
||||
uni.navigateTo({
|
||||
url: "/pages/shopMallPage/shopType/index"
|
||||
});
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: "/pages/highwayHeadlines/attractInvestment"
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
// 跳转到商城
|
||||
handleGoShop: function handleGoShop() {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -572,15 +572,15 @@ var _default = {
|
||||
// const data2 = await this.$api.getCoop(req2);
|
||||
// const data3 = await this.$api.getCoop(req3);
|
||||
_context2.next = 5;
|
||||
return _this3.$api.$javaGet('/third-party/getExcludeWeChatGetMallGoodsInfo', req1);
|
||||
return _this3.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', req1);
|
||||
case 5:
|
||||
data1 = _context2.sent;
|
||||
_context2.next = 8;
|
||||
return _this3.$api.$javaGet('/third-party/getExcludeWeChatGetMallGoodsInfo', req2);
|
||||
return _this3.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', req2);
|
||||
case 8:
|
||||
data2 = _context2.sent;
|
||||
_context2.next = 11;
|
||||
return _this3.$api.$javaGet('/third-party/getExcludeWeChatGetMallGoodsInfo', req3);
|
||||
return _this3.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', req3);
|
||||
case 11:
|
||||
data3 = _context2.sent;
|
||||
list1 = _this3.handleChangeShopList(data1.Data.List);
|
||||
@ -876,7 +876,9 @@ var _default = {
|
||||
switch (_context7.prev = _context7.next) {
|
||||
case 0:
|
||||
_context7.next = 2;
|
||||
return _this8.$api.$javaGet('/third-party/getExcludeWeChatGetMallGoodsInfo', {
|
||||
return _this8.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfoExclude',
|
||||
// url,
|
||||
{
|
||||
ownerUnitId: 911,
|
||||
userdefinedTypeId: 1355,
|
||||
excludeNature: 5070,
|
||||
@ -916,27 +918,46 @@ var _default = {
|
||||
handleGetSpecialOffers: function handleGetSpecialOffers() {
|
||||
var _this9 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
|
||||
var data, list, shopList;
|
||||
var url, data, list, shopList, shopIdList;
|
||||
return _regenerator.default.wrap(function _callee8$(_context8) {
|
||||
while (1) {
|
||||
switch (_context8.prev = _context8.next) {
|
||||
case 0:
|
||||
_context8.next = 2;
|
||||
return _this9.$api.$javaGet('/third-party/getExcludeWeChatGetMallGoodsInfo', {
|
||||
// const data = await this.$api.getCoop({
|
||||
// action_type: "WeChat_GetMallGoodsInfo",
|
||||
// ownerUnitId: 911,
|
||||
// COMMODITYNATURE: 5030,
|
||||
// excludeNature: 5070,
|
||||
// justCommodity: 1,
|
||||
// });
|
||||
url = _this9.pageType === "UnionMall" ? '/third-party/getWeChatGetMallGoodsInfo' : '/third-party/getWeChatGetMallGoodsInfoExclude';
|
||||
_context8.next = 3;
|
||||
return _this9.$api.$javaGet(
|
||||
// '/third-party/getExcludeWeChatGetMallGoodsInfo',
|
||||
url, {
|
||||
ownerUnitId: 911,
|
||||
COMMODITYNATURE: 5030,
|
||||
// COMMODITYNATURE: 5030,//特价优惠
|
||||
COMMODITYNATURE: 5021,
|
||||
// 绿色云品
|
||||
userdefinedTypeId: 3186,
|
||||
// 绿色云品
|
||||
userdefinedtypeId: 3186,
|
||||
// 绿色云品
|
||||
excludeNature: 5070,
|
||||
justCommodity: 1
|
||||
});
|
||||
case 2:
|
||||
case 3:
|
||||
data = _context8.sent;
|
||||
console.log("handleGetSpecialOffers", data);
|
||||
list = data.Data && data.Data.List ? data.Data.List : [];
|
||||
shopList = [];
|
||||
shopIdList = [];
|
||||
if (list && list.length > 0) {
|
||||
list.forEach(function (item) {
|
||||
if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
|
||||
item.COMMODITYLIST.forEach(function (subItem) {
|
||||
if (shopIdList.indexOf(subItem.COMMODITY_ID) === -1) {
|
||||
shopIdList.push(subItem.COMMODITY_ID);
|
||||
if (subItem.COMMODITY_MEMBERPRICE && subItem.COMMODITY_MEMBERPRICE.toString().indexOf(".") !== -1) {
|
||||
subItem.bigNumber = subItem.COMMODITY_MEMBERPRICE.toString().split(".")[0];
|
||||
subItem.smallNumber = subItem.COMMODITY_MEMBERPRICE.toString().split(".")[1];
|
||||
@ -950,13 +971,14 @@ var _default = {
|
||||
subItem.RETbigNumber = subItem.COMMODITY_RETAILPRICE;
|
||||
}
|
||||
shopList.push(subItem);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
console.log("特价优惠", shopList);
|
||||
_this9.specialOffersList = shopList;
|
||||
case 9:
|
||||
case 11:
|
||||
case "end":
|
||||
return _context8.stop();
|
||||
}
|
||||
@ -1019,15 +1041,23 @@ var _default = {
|
||||
handleGetTodayOffers: function handleGetTodayOffers() {
|
||||
var _this11 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
|
||||
var data, list, shopList, obj, _shopList;
|
||||
var data, list, shopList, shopIdList, obj, _shopList;
|
||||
return _regenerator.default.wrap(function _callee10$(_context10) {
|
||||
while (1) {
|
||||
switch (_context10.prev = _context10.next) {
|
||||
case 0:
|
||||
_context10.next = 2;
|
||||
return _this11.$api.$javaGet('/third-party/getExcludeWeChatGetMallGoodsInfo', {
|
||||
return _this11.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfoExclude',
|
||||
// url,
|
||||
{
|
||||
ownerUnitId: 911,
|
||||
COMMODITYNATURE: 4598,
|
||||
// COMMODITYNATURE: 4598,// 原今日推荐
|
||||
COMMODITYNATURE: 5022,
|
||||
//自有品牌
|
||||
userdefinedtypeId: 3175,
|
||||
// 商品分类
|
||||
userdefinedTypeId: 3175,
|
||||
// 商品分类
|
||||
excludeNature: 5070,
|
||||
justCommodity: 1
|
||||
});
|
||||
@ -1036,10 +1066,13 @@ var _default = {
|
||||
console.log("今日推荐", data);
|
||||
list = data.Data.List;
|
||||
shopList = [];
|
||||
shopIdList = [];
|
||||
if (list && list.length > 0) {
|
||||
list.forEach(function (item) {
|
||||
if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
|
||||
item.COMMODITYLIST.forEach(function (subItem) {
|
||||
if (shopIdList.indexOf(subItem.COMMODITY_ID) === -1) {
|
||||
shopIdList.push(subItem.COMMODITY_ID);
|
||||
if (subItem.COMMODITY_MEMBERPRICE && subItem.COMMODITY_MEMBERPRICE.toString().indexOf(".") !== -1) {
|
||||
subItem.bigNumber = subItem.COMMODITY_MEMBERPRICE.toString().split(".")[0];
|
||||
subItem.smallNumber = subItem.COMMODITY_MEMBERPRICE.toString().split(".")[1];
|
||||
@ -1053,13 +1086,14 @@ var _default = {
|
||||
subItem.RETbigNumber = subItem.COMMODITY_RETAILPRICE;
|
||||
}
|
||||
shopList.push(subItem);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
_this11.todayOffersList = shopList;
|
||||
return _context10.abrupt("return");
|
||||
case 11:
|
||||
case 12:
|
||||
case "end":
|
||||
return _context10.stop();
|
||||
}
|
||||
@ -1099,18 +1133,37 @@ var _default = {
|
||||
// justCommodity: 1,
|
||||
// // excludeNature: 5070,
|
||||
// });
|
||||
|
||||
// 原本下面商城的内容
|
||||
|
||||
// const data = await this.$api.$javaGet(
|
||||
// '/third-party/getWeChatGetMallGoodsInfo',
|
||||
// {
|
||||
// ownerUnitId: 911,
|
||||
// COMMODITYNATURE: this.selectProducts === 4597 ? '' : 3000,
|
||||
// userdefinedTypeId: this.selectProducts || "",
|
||||
// Page_Size: this.shopMsg.pageSize,
|
||||
// Page_Index: this.shopMsg.pageIndex,
|
||||
// justCommodity: 1,
|
||||
// }
|
||||
// )
|
||||
|
||||
//
|
||||
_context11.next = 3;
|
||||
return _this12.$api.$javaGet('/third-party/getExcludeWeChatGetMallGoodsInfo', {
|
||||
return _this12.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
|
||||
ownerUnitId: 911,
|
||||
COMMODITYNATURE: _this12.selectProducts === 4597 ? '' : 3000,
|
||||
userdefinedTypeId: _this12.selectProducts || "",
|
||||
Page_Size: _this12.shopMsg.pageSize,
|
||||
Page_Index: _this12.shopMsg.pageIndex,
|
||||
justCommodity: 1
|
||||
justCommodity: 1,
|
||||
payMethod: "2000,3000",
|
||||
COMMODITYNATURE: 6000
|
||||
// COMMODITYNATURE: this.selectProducts === 4597 ? '' : 3000,
|
||||
// userdefinedTypeId: this.selectProducts || "",
|
||||
// Page_Size: this.shopMsg.pageSize,
|
||||
// Page_Index: this.shopMsg.pageIndex,
|
||||
});
|
||||
case 3:
|
||||
data = _context11.sent;
|
||||
list = data.Data.List;
|
||||
console.log('积分商城', list);
|
||||
resList = [];
|
||||
thisResList = [];
|
||||
if (_this12.shopMsg.pageIndex > 1) {
|
||||
@ -1143,7 +1196,7 @@ var _default = {
|
||||
}
|
||||
// this.productsList = list;
|
||||
_this12.productsList = resList.concat(thisResList);
|
||||
console.log("甄选商品", list);
|
||||
console.log("甄选商品", _this12.productsList);
|
||||
uni.hideLoading();
|
||||
|
||||
// let shopList = []
|
||||
@ -1156,7 +1209,7 @@ var _default = {
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
case 13:
|
||||
case 14:
|
||||
case "end":
|
||||
return _context11.stop();
|
||||
}
|
||||
@ -1183,9 +1236,13 @@ var _default = {
|
||||
});
|
||||
},
|
||||
// 跳转商品列表接口
|
||||
handleGoShopList: function handleGoShopList(type) {
|
||||
uni.navigateTo({
|
||||
url: "/pages/shopPages/shopList/index?type=".concat(type, "&pageType=").concat(this.pageType || "")
|
||||
handleGoShopList: function handleGoShopList(value, index) {
|
||||
// uni.navigateTo({
|
||||
// url: `/pages/shopPages/shopList/index?type=${type}&pageType=${this.pageType || ""
|
||||
// }`,
|
||||
// });
|
||||
uni.redirectTo({
|
||||
url: "/pages/shopMallPage/shopType/index?leftId=".concat(value, "&pageType=").concat(this.pageType, "&selectIndex=").concat(index)
|
||||
});
|
||||
},
|
||||
// 跳转商品详情
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -597,6 +597,11 @@
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.main .pageContent .advertisementSecond .advertisementItem .advertisementItemContent .contentTop .title.data-v-79c11018 {
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
color: #181716;
|
||||
}
|
||||
.main .pageContent .advertisementSecond .advertisementItem .advertisementItemContent .contentTop .title .titleImg.data-v-79c11018 {
|
||||
width: 112rpx;
|
||||
height: 36rpx;
|
||||
@ -744,6 +749,18 @@
|
||||
width: 100%;
|
||||
margin-top: 40rpx;
|
||||
}
|
||||
.main .pageContent .allShopList .allShopTitle.data-v-79c11018 {
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
color: #181716;
|
||||
}
|
||||
.main .pageContent .allShopList .jfDescBox.data-v-79c11018 {
|
||||
width: 100%;
|
||||
margin-top: 24rpx;
|
||||
}
|
||||
.main .pageContent .allShopList .jfDescBox .descImg.data-v-79c11018 {
|
||||
width: 100%;
|
||||
}
|
||||
.main .pageContent .allShopList .allTypeBox.data-v-79c11018 {
|
||||
width: calc(100vw - 48rpx);
|
||||
height: 60rpx;
|
||||
|
||||
@ -614,7 +614,7 @@ var _default = {
|
||||
// payMethod: "1000,3000",
|
||||
// // justCommodity: 1,
|
||||
// });
|
||||
url = _this3.pageType === "UnionMall" ? '/third-party/getExcludeWeChatGetMallGoodsInfo' : '/third-party/getWeChatGetMallGoodsInfoExclude';
|
||||
url = _this3.pageType === "UnionMall" ? '/third-party/getWeChatGetMallGoodsInfo' : '/third-party/getWeChatGetMallGoodsInfoExclude';
|
||||
_context2.next = 5;
|
||||
return _this3.$api.$javaGet(
|
||||
// '/third-party/getExcludeWeChatGetMallGoodsInfo',
|
||||
@ -622,8 +622,8 @@ var _default = {
|
||||
ownerUnitId: 911,
|
||||
appId: "wxee018fb96955552a",
|
||||
commodityName: _this3.searchText,
|
||||
excludeNature: _this3.pageType === "UnionMall" ? null : 5070,
|
||||
commodityNature: _this3.pageType === "UnionMall" ? 5070 : null,
|
||||
excludeNature: _this3.pageType === "UnionMall" ? "" : 5070,
|
||||
commodityNature: _this3.pageType === "UnionMall" ? 5070 : "",
|
||||
payMethod: "1000,3000"
|
||||
// justCommodity: 1,
|
||||
});
|
||||
@ -767,7 +767,7 @@ var _default = {
|
||||
handleGetAllShopItem: function handleGetAllShopItem(id) {
|
||||
var _this5 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
|
||||
var data, list, thisAllType, haveAll, leftIndex, shopList, thisTypeAllShop, allShopID, obj, newList, allShopList, allShopID2;
|
||||
var url, data, list, thisAllType, haveAll, leftIndex, shopList, thisTypeAllShop, allShopID, obj, newList, allShopList, allShopID2;
|
||||
return _regenerator.default.wrap(function _callee4$(_context4) {
|
||||
while (1) {
|
||||
switch (_context4.prev = _context4.next) {
|
||||
@ -785,8 +785,11 @@ var _default = {
|
||||
// commodityNature: this.pageType === "UnionMall" ? 5070 : "",
|
||||
// // justCommodity: 1,
|
||||
// });
|
||||
_context4.next = 4;
|
||||
return _this5.$api.$javaGet('/third-party/getExcludeWeChatGetMallGoodsInfo', {
|
||||
url = _this5.pageType === "UnionMall" ? '/third-party/getWeChatGetMallGoodsInfo' : '/third-party/getWeChatGetMallGoodsInfoExclude';
|
||||
_context4.next = 5;
|
||||
return _this5.$api.$javaGet(
|
||||
// '/third-party/getExcludeWeChatGetMallGoodsInfo',
|
||||
url, {
|
||||
ownerUnitId: 911,
|
||||
userdefinedTypeId: _this5.searchText ? "" : id,
|
||||
userdefinedtypeId: _this5.searchText ? "" : id,
|
||||
@ -795,7 +798,7 @@ var _default = {
|
||||
commodityNature: _this5.pageType === "UnionMall" ? 5070 : ""
|
||||
// justCommodity: 1,
|
||||
});
|
||||
case 4:
|
||||
case 5:
|
||||
data = _context4.sent;
|
||||
uni.hideLoading();
|
||||
list = data.Data.List;
|
||||
@ -984,7 +987,7 @@ var _default = {
|
||||
}
|
||||
console.log("现在的小类", _this5.leftTypeList);
|
||||
uni.hideLoading();
|
||||
case 29:
|
||||
case 30:
|
||||
case "end":
|
||||
return _context4.stop();
|
||||
}
|
||||
|
||||
@ -149,8 +149,9 @@ var render = function () {
|
||||
_vm.good.OFF_DATE && !_vm.isCountdown
|
||||
? new Date(_vm.good.OFF_DATE).getTime()
|
||||
: null
|
||||
var g8 = new Date().getTime()
|
||||
var g9 = new Date(_vm.good.OFF_DATE).getTime()
|
||||
var g8 =
|
||||
new Date().getTime() > new Date(_vm.good.OFF_DATE).getTime() &&
|
||||
!(_vm.good.OFF_DATE && !_vm.isCountdown)
|
||||
_vm.$mp.data = Object.assign(
|
||||
{},
|
||||
{
|
||||
@ -164,7 +165,6 @@ var render = function () {
|
||||
g6: g6,
|
||||
g7: g7,
|
||||
g8: g8,
|
||||
g9: g9,
|
||||
},
|
||||
}
|
||||
)
|
||||
@ -219,6 +219,7 @@ var _default = {
|
||||
data: function data() {
|
||||
var windows = uni.getSystemInfoSync();
|
||||
return {
|
||||
safeHeight: 0,
|
||||
pageMsg: {
|
||||
current: 0,
|
||||
imgeCount: 0,
|
||||
@ -1154,6 +1155,9 @@ var _default = {
|
||||
clearInterval(this.timer);
|
||||
},
|
||||
onLoad: function onLoad(option) {
|
||||
var systemInfo = uni.getSystemInfoSync();
|
||||
var height = systemInfo.safeAreaInsets.bottom;
|
||||
this.safeHeight = Number(height);
|
||||
this.menu = uni.getMenuButtonBoundingClientRect();
|
||||
console.log("option", option);
|
||||
if (option.pageType) {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -361,7 +361,7 @@ button.data-v-0dc4ca38:after {
|
||||
align-items: center;
|
||||
text-align: center;
|
||||
justify-content: space-between;
|
||||
z-index: 1;
|
||||
z-index: 2;
|
||||
box-sizing: border-box;
|
||||
padding-bottom: 24rpx;
|
||||
background: #fff;
|
||||
@ -484,6 +484,7 @@ button.data-v-0dc4ca38:after {
|
||||
height: 64rpx;
|
||||
background: #fff2e7;
|
||||
position: fixed;
|
||||
z-index: 2;
|
||||
left: 0;
|
||||
bottom: 124rpx;
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
@ -503,7 +504,7 @@ button.data-v-0dc4ca38:after {
|
||||
}
|
||||
.shopPopupBox.data-v-0dc4ca38 {
|
||||
width: 100%;
|
||||
height: 70vh;
|
||||
height: 80vh;
|
||||
background: #fff;
|
||||
border-radius: 16rpx 16rpx 0 0;
|
||||
box-sizing: border-box;
|
||||
@ -511,7 +512,7 @@ button.data-v-0dc4ca38:after {
|
||||
}
|
||||
.shopPopupBox .shopPopupContent.data-v-0dc4ca38 {
|
||||
width: 100%;
|
||||
height: calc(70vh - 92rpx - 64rpx);
|
||||
height: calc(80vh - 80px - 32px + 12rpx);
|
||||
margin-bottom: 12rpx;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .detailTop.data-v-0dc4ca38 {
|
||||
@ -575,12 +576,16 @@ button.data-v-0dc4ca38:after {
|
||||
color: #9fa3a8;
|
||||
line-height: 18px;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .detailMessage.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox.data-v-0dc4ca38 {
|
||||
width: 100%;
|
||||
height: calc(80vh - 80px - 32px + 12rpx - 80px);
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .detailMessage.data-v-0dc4ca38 {
|
||||
margin-top: 16px;
|
||||
border-bottom: 1px solid #f2f4f5;
|
||||
padding-bottom: 16px;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .detailMessage .detailTitle.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .detailMessage .detailTitle.data-v-0dc4ca38 {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Semibold, PingFang SC;
|
||||
font-weight: 600;
|
||||
@ -588,37 +593,37 @@ button.data-v-0dc4ca38:after {
|
||||
line-height: 20px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .detailMessage .detailText.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .detailMessage .detailText.data-v-0dc4ca38 {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #6c737a;
|
||||
line-height: 18px;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .orderDetail.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail.data-v-0dc4ca38 {
|
||||
margin-top: 16px;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .orderDetail .orderTitle.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .orderTitle.data-v-0dc4ca38 {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Semibold, PingFang SC;
|
||||
font-weight: 600;
|
||||
color: #020e1a;
|
||||
line-height: 20px;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .orderDetail .numBox.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .numBox.data-v-0dc4ca38 {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-top: 12px;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .orderDetail .numBox .numTitle.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .numBox .numTitle.data-v-0dc4ca38 {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #020e1a;
|
||||
line-height: 20px;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .orderDetail .numBox .cartcontrol.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .numBox .cartcontrol.data-v-0dc4ca38 {
|
||||
width: 150px;
|
||||
height: 30px;
|
||||
line-height: 24px;
|
||||
@ -627,7 +632,7 @@ button.data-v-0dc4ca38:after {
|
||||
border: 1px solid rgba(2, 14, 26, 0.06);
|
||||
border-radius: 2px;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .orderDetail .numBox .cartcontrol .subtract.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .numBox .cartcontrol .subtract.data-v-0dc4ca38 {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
background: #f2f4f5;
|
||||
@ -638,33 +643,40 @@ button.data-v-0dc4ca38:after {
|
||||
font-size: 8px;
|
||||
color: #9fa3a8;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .orderDetail .numBox .cartcontrol .subtract .img.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .numBox .cartcontrol .subtract .img.data-v-0dc4ca38 {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .orderDetail .numBox .cartcontrol .cart-count.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .numBox .cartcontrol .cart-count.data-v-0dc4ca38 {
|
||||
height: 30px !important;
|
||||
font-size: 16px;
|
||||
line-height: 30px;
|
||||
flex: 1;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .orderDetail .sizeBox.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .sizeBox.data-v-0dc4ca38 {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-top: 12px;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .orderDetail .sizeBox .sizeTitle.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .sizeBox .sizeTitle.data-v-0dc4ca38 {
|
||||
display: inline-block;
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #020e1a;
|
||||
line-height: 20px;
|
||||
width: 100rpx;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .orderDetail .sizeBox .sizeList.data-v-0dc4ca38 {
|
||||
display: flex;
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .sizeBox .sizeScrollBox.data-v-0dc4ca38 {
|
||||
width: calc(100% - 112rpx);
|
||||
flex: 1;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .orderDetail .sizeBox .sizeList .sizeItem.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .sizeBox .sizeScrollBox .sizeList.data-v-0dc4ca38 {
|
||||
width: 100%;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .sizeBox .sizeScrollBox .sizeList .sizeItem.data-v-0dc4ca38 {
|
||||
font-size: 12px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
@ -674,8 +686,11 @@ button.data-v-0dc4ca38:after {
|
||||
background: #dbdad6;
|
||||
border-radius: 4px;
|
||||
margin-left: 8px;
|
||||
display: inline-block;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .orderDetail .sizeBox .sizeList .selectSizeItem.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .sizeBox .sizeScrollBox .sizeList .selectSizeItem.data-v-0dc4ca38 {
|
||||
display: inline-block;
|
||||
font-size: 12px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
@ -685,8 +700,9 @@ button.data-v-0dc4ca38:after {
|
||||
background: #e7f3ff;
|
||||
border-radius: 4px;
|
||||
margin-left: 8px;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .orderDetail .descBox.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .descBox.data-v-0dc4ca38 {
|
||||
width: 100%;
|
||||
height: 76px;
|
||||
background: #f2f4f5;
|
||||
@ -695,7 +711,7 @@ button.data-v-0dc4ca38:after {
|
||||
padding: 8px 12px;
|
||||
margin-top: 19px;
|
||||
}
|
||||
.shopPopupBox .shopPopupContent .orderDetail .submitBtn.data-v-0dc4ca38 {
|
||||
.shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .submitBtn.data-v-0dc4ca38 {
|
||||
font-size: 16px;
|
||||
font-family: PingFangSC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
|
||||
@ -7,6 +7,13 @@
|
||||
"condition": {
|
||||
"miniprogram": {
|
||||
"list": [
|
||||
{
|
||||
"name": "pages/shopPages/shopDetail/index",
|
||||
"pathName": "pages/shopPages/shopDetail/index",
|
||||
"query": "id=154761&pageType=",
|
||||
"launchMode": "default",
|
||||
"scene": null
|
||||
},
|
||||
{
|
||||
"name": "pages/shopPages/shopDetail/index",
|
||||
"pathName": "pages/shopPages/shopDetail/index",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user