ylj/caiyunyi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ylj20011123 2025-11-20 18:52:39 +08:00
parent 9806f0a7c2
commit a3c7ff0648
74 changed files with 421 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/eventRegistration/index.vue
View File

@ -28,7 +28,7 @@
<div class="info-item">
<span class="info-icon">📅</span>
<span class="info-text">{{ event.ACTIVITY_STARTDATE ? event.ACTIVITY_STARTDATE : ""
}}{{ event.ACTIVITY_ENDDATE ? `-` + event.ACTIVITY_ENDDATE : "" }}</span>
}}{{ event.ACTIVITY_ENDDATE ? `-` + event.ACTIVITY_ENDDATE : "" }}</span>
</div>
<div class="info-item">
<span class="info-icon">📍</span>
@ -36,7 +36,7 @@
</div>
</div>
<div class="event-footer">
<div class="event-footer" v-if="Number(event.ACTIVITY_TYPE) === 1000">
<div class="participation-info">
<div class="current-participants">
已报名：{{ event.currentParticipants || 0 }}人

3
pages/homeFn/myCoupon/index.vue
View File

@ -35,7 +35,8 @@
<view class="couponItemName">{{ item.CouponName }}</view>
<view class="couponItemTime" v-if="item.CouponSendId">有效期至{{ item.EndTime }}</view>
<view class="couponItemTime" v-else>活动至{{ item.EndTime }}</view>
<view class="couponItemUsedType" @click="handleShowRule(item)" v-if="item.PayMethodText">
<view class="couponItemUsedType" @click="handleShowRule(item)"
v-if="item.PayMethodText && item.CouponType !== 9000">
<view class="couponItemUsedTypeLabel">使用规则</view>
<image class="couponItemUsedTypeIcon"
:style="{ transform: item.showRule ? 'rotate(180deg)' : 'rotate(0deg)' }"

4
pages/order/orderdetail/index.vue
View File

@ -48,8 +48,8 @@
">
<!-- orderInfo.SALEBILL_STATE !== 1005
orderInfo.SALEBILL_STATE !== 1010 && -->
<div class="continu-btn" @click="handleRefund"
v-if="orderInfo.SALEBILL_STATE === 1010 && orderInfo.SALEBILL_TYPE !== 3001">
<div class="continu-btn" @click="handleRefund" v-if="orderInfo.SALEBILL_STATE === 1010">
<!-- && orderInfo.SALEBILL_TYPE !== 3001 -->
发起退款
</div>
<!-- <div class="back-btn" @click="goShop" v-if="orderInfo.SALEBILL_STATE!=1010">再来一单</div> -->

4
pages/order/orderdetail/reasonforRefund.vue
View File

@ -186,6 +186,7 @@ export default {
this.isClick = true
let _this = this;
let openId = uni.getStorageSync("openId");
let reqOrder = {
action_type: "ScanOrder",
@ -234,6 +235,9 @@ export default {
});
this.isClick = false
}
},
},
};

6
pages/serviceDetail/index.vue
View File

@ -662,13 +662,13 @@ export default {
menu: {},
detailInfo: {}, // 服务区信息对象
firstTabList: [
{ label: "加油", value: 1 },
{ label: "活动", value: 5 },
{ label: "充电", value: 2 },
{ label: "停车场", value: 3 },
{ label: "汽修", value: 4 },
{ label: "活动", value: 5 },
{ label: "加油", value: 1 },
], // 加油 充电 停车场 的tab
firstTab: 1,
firstTab: 5,
secondTabList: [
{ label: "卫生间", value: 1 },
{ label: "母婴室", value: 2 },

135
pages/shopMallPage/index/index.vue
View File

@ -714,10 +714,32 @@
<uni-popup ref="priceRangeRef" @maskClick="handleMaskClick">
<view class="priceRangeBox" :style="{ bottom: popupBottom + 'px' }">
<image class="closeIcon" src="/static/images/home/closeIcon.svg" @click="handleClosePricePopup" />
<view class="sortBox">
<view class="sortItemBox">
<view class="sortItemTitle">排序类别</view>
<picker class="sortItemValue" @change="handleChangeShopSort" :value="selectShopSort"
:range="shopSortTypeList" range-key="label">
<view class="picker"> {{ shopSortTypeList[selectShopSort].label }}
<image class="pickerIcon" src="https://eshangtech.com/caiyunyiImg/bottomArrow.png" />
</view>
</picker>
</view>
<view class="sortItemBox">
<view class="sortItemTitle">排序类型</view>
<picker class="sortItemValue" @change="handleChangeSortType" :value="selectSortType" :range="sortTypeList"
range-key="label">
<view class="picker"> {{ sortTypeList[selectSortType].label }}
<image class="pickerIcon" src="https://eshangtech.com/caiyunyiImg/bottomArrow.png" />
</view>
</picker>
</view>
</view>
<view class="titleBox">
<view class="closeIcon"></view>
<text class="title">价格区间</text>
<image class="closeIcon" src="/static/images/home/closeIcon.svg" @click="handleClosePricePopup" />
</view>
<view class="inputBox">
@ -793,7 +815,7 @@ export default {
oneRowNumber: 0, // 单行个数
productsList: [], // 甄选商品
selectProducts: 0, // 选择的甄选商品类型
pageType: "", // 页面类型
pageType: "", // 页面类型
brandList: [
{ label: "蓝月亮", value: 1, src: "/static/images/home/1.png" },
{ label: "洁柔", value: 2, src: "/static/images/home/2.png" },
@ -813,7 +835,7 @@ export default {
pageIndex: 1, // 当前显示几个 10个商品
shopMsg: {
pageIndex: 1,
pageSize: 6,
pageSize: 10,
isOver: false,
},
havePrice: false, // 有无价格区间查询
@ -846,7 +868,19 @@ export default {
{ label: "商城首页", src: "" },
{ label: "", src: "" },
],
showModalActivityImg: false
showModalActivityImg: false,
shopSortTypeList: [
{ label: "综合排序", value: 1 },
{ label: "价格排序", value: 2 },
{ label: "销量排序", value: 3 },
{ label: "上架时间排序", value: 4 },
],
selectShopSort: 0,
sortTypeList: [
{ label: "由低到高", value: 1 },
{ label: "由高到低", value: 2 },
],
selectSortType: 1
};
},
computed: {
@ -1005,6 +1039,24 @@ export default {
this.isFirstLoad = true;
},
methods: {
// 改变商品排序规则
handleChangeSortType(e) {
this.selectSortType = Number(e.detail.value)
},
// 改变商品排序类型
handleChangeShopSort(e) {
let type = Number(e.detail.value)
if (type === 0) {
this.sortTypeList = [{ label: "由低到高", value: 1 }, { label: "由高到低", value: 2 }]
} else if (type === 1) {
this.sortTypeList = [{ label: "由低到高", value: 1 }, { label: "由高到低", value: 2 }]
} else if (type === 2) {
this.sortTypeList = [{ label: "由低到高", value: 1 }, { label: "由高到低", value: 2 }]
} else if (type === 3) {
this.sortTypeList = [{ label: "由远到近", value: 1 }, { label: "由近到远", value: 2 }]
}
this.selectShopSort = type
},
handleShowModalActivityImg(e) {
console.log('eee', e);
@ -1251,8 +1303,12 @@ export default {
Page_Index: this.shopMsg.pageIndex, // 页码
userdefinedtypeId: this.selectProducts || "", // 大小类id
justCommodity: 1, // 写死
sortStr: `${this.sortTypeList[this.sortType]} ${new Date().getTime % 2 > 0 ? "" : "desc"
}`, // 排序
// sortStr: `${this.sortTypeList[this.sortType]} ${new Date().getTime % 2 > 0 ? "" : "desc"
// }`, // 排序
sortStr: `${this.selectShopSort === 0 ? 'COMMODITY_BARCODE' : this.selectShopSort === 1 ? 'COMMODITY_MEMBERPRICE' : this.selectShopSort === 2 ? 'COMMODITY_EN' : this.selectShopSort === 3 ? 'OPERATE_DATE' : ''} ${this.selectSortType === 0 ? 'asc' : 'desc'}`
});
console.log("handleGetSpecialOffers", data);
let list = data.Data && data.Data.List ? data.Data.List : [];
@ -1334,7 +1390,7 @@ export default {
this.showShopList = [];
this.shopMsg = {
pageIndex: 1,
pageSize: 6,
pageSize: 10,
isOver: false,
};
// 拿到工会之家的商品列表
@ -3833,7 +3889,7 @@ export default {
.priceRangeBox {
width: 100%;
height: 600rpx;
height: 800rpx;
background-color: #fff;
border-radius: 32rpx 32rpx 0 0;
box-sizing: border-box;
@ -3841,6 +3897,59 @@ export default {
transition: bottom 0.2s;
position: fixed;
.closeIcon {
width: 48rpx;
height: 48rpx;
position: absolute;
top: 32rpx;
right: 32rpx;
}
.sortBox {
width: 100%;
height: 180rpx;
box-sizing: border-box;
padding-top: 48rpx;
display: flex;
align-items: center;
margin-bottom: 10rpx;
.sortItemBox {
width: 50%;
height: 100%;
box-sizing: border-box;
padding-right: 32rpx;
.sortItemTitle {
font-size: 28rpx;
}
.sortItemValue {
background-color: #f5f6f7;
box-sizing: border-box;
padding: 16rpx;
border-radius: 16rpx;
margin-top: 16rpx;
display: flex;
align-items: center;
justify-content: space-between;
display: block;
font-size: 28rpx;
.picker {
width: 100%;
text-align: center;
.pickerIcon {
width: 24rpx;
height: 24rpx;
margin-left: 8rpx;
}
}
}
}
}
.titleBox {
width: 100%;
display: flex;
@ -3850,17 +3959,14 @@ export default {
.title {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 32rpx;
font-size: 28rpx;
color: #130f05;
line-height: 44rpx;
text-align: left;
font-style: normal;
}
.closeIcon {
width: 48rpx;
height: 48rpx;
}
}
.inputBox {
@ -3869,7 +3975,8 @@ export default {
box-sizing: border-box;
padding: 16rpx;
border-radius: 16rpx;
margin-top: 32rpx;
margin-top: 16rpx;
font-size: 28rpx;
display: flex;
align-items: center;
justify-content: space-between;

48
pages/shopMallPage/shopType/index.vue
View File

@ -173,7 +173,7 @@
<div class="detailPrice">
<span class="priceUnit">¥</span>
<span class="number" style="font-size: 20px">
{{ item.bigNumber || "" }}</span>
{{ item.bigNumber || "0" }}</span>
<span class="number" style="font-size: 14px">.{{ item.smallNumber || "00" }}</span>
<span class="unit">/ {{ item.COMMODITY_UNIT }}</span>
@ -181,30 +181,32 @@
<!-- <span class="marketPriceValue">XXX</span> -->
<!-- <span class="unit">/ {{ item.COMMODITY_UNIT }}</span> -->
</div>
<div v-if="item.SKULIST && item.SKULIST.length > 0" class="specifications"
@click.stop="handleShowPopup(item)">
选规格
<text class="specificationsCount" v-if="item.count > 0">{{
item.count
}}</text>
</div>
<div class="addReduceBox" v-else>
<div class="reduceShopCar" @click.stop="touchReduce($event, item)" v-if="item.showReduce">
<img class="optionBtn"
:src="pageType === 'UnionMall' ? '/static/images/home/newReduce.png' : '/static/images/home/newReduce.png'" />
<div v-if="!item.bigNumber && !item.smallNumber ? user.TEST_MEMBER ? true : false : true">
<div v-if="item.SKULIST && item.SKULIST.length > 0" class="specifications"
@click.stop="handleShowPopup(item)">
选规格
<text class="specificationsCount" v-if="item.count > 0">{{
item.count
}}</text>
</div>
<span class="itemCount" v-if="item.count && item.count > 0">{{ item.count }}</span>
<div v-if="item.COMMODITY_STOCK > 0 && activeTabs !== 999999" class="addShopCar"
@click.stop="touchOnGoods($event, item)" :id="'add_' +
item.SELLERCOMMODITY_ID +
'_' +
item.SELLERCOMMODITYTYPE_ID
">
<img class="optionBtn"
:src="pageType === 'UnionMall' ? '/static/images/home/newAddIcon.png' : '/static/images/home/newAddIcon.png'" />
<div class="addReduceBox" v-else>
<div class="reduceShopCar" @click.stop="touchReduce($event, item)" v-if="item.showReduce">
<img class="optionBtn"
:src="pageType === 'UnionMall' ? '/static/images/home/newReduce.png' : '/static/images/home/newReduce.png'" />
</div>
<span class="itemCount" v-if="item.count && item.count > 0">{{ item.count }}</span>
<div v-if="item.COMMODITY_STOCK > 0 && activeTabs !== 999999" class="addShopCar"
@click.stop="touchOnGoods($event, item)" :id="'add_' +
item.SELLERCOMMODITY_ID +
'_' +
item.SELLERCOMMODITYTYPE_ID
">
<img class="optionBtn"
:src="pageType === 'UnionMall' ? '/static/images/home/newAddIcon.png' : '/static/images/home/newAddIcon.png'" />
</div>
<div v-if="activeTabs === 999999"></div>
<div v-if="item.COMMODITY_STOCK === 0 || !item.COMMODITY_STOCK" class="shopState">已售罄</div>
</div>
<div v-if="activeTabs === 999999"></div>
<div v-if="item.COMMODITY_STOCK === 0 || !item.COMMODITY_STOCK" class="shopState">已售罄</div>
</div>
</div>

51
pages/shopPages/shopDetail/index.vue
View File

@ -123,7 +123,7 @@
backgroundSize: '100% 100%',
}"
></view> -->
<!-- mode="aspectFit" -->
<!-- mode="aspectFit" -->
<image :lazy-load="true" :src="img.IMAGE_URL" @click="handlePreviewSwiper(img, i)">
</image>
</swiper-item>
@ -156,7 +156,7 @@
<div class="vip-price">
<span class="unit">¥</span>
<span style="font-weight: bold">
{{ good.bigNumber || "" }}.{{ good.smallNumber || "00" }}
{{ good.bigNumber || "0" }}.{{ good.smallNumber || "00" }}
<!-- {{ good.COMMODITY_MEMBERPRICE || "-" }} -->
</span>
</div>
@ -468,28 +468,33 @@
> -->
<!-- 积分暂时没有规定 所以 -->
<view class="rightBtn" v-if="good.PAY_METHOD !== 2000 && pageType !== 'pointsMall' && !offShop">
<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>
<view style="width: 58%;height: 100%;"
v-if="!good.bigNumber && !good.smallNumber ? user.TEST_MEMBER ? true : false : true">
<view class="rightBtn" style="width: 100%;height: 100%;"
v-if="good.PAY_METHOD !== 2000 && pageType !== 'pointsMall' && !offShop">
<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>
<view class="rightBtn" v-if="(good.PAY_METHOD === 2000 || pageType === 'pointsMall') && !offShop">
<div class="sellOut" style="width: 100%;border-radius: 16rpx;">
积分不足
</div>
<view class="rightBtn" style="width: 100%;height: 100%;"
v-if="(good.PAY_METHOD === 2000 || pageType === 'pointsMall') && !offShop">
<div class="sellOut" style="width: 100%;border-radius: 16rpx;">
积分不足
</div>
</view>
</view>
<!-- <div
class="buynow-btn"

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/card.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/currentService.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/keyboard.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/noData.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/shopTabbar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/tabbar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/allFunPage/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/bindCar/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/evaluateList/addEvaluate.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/evaluateList/components/orderItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/evaluateList/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/highwayHeadlines/detail.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/highwayHeadlines/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myAddress/address/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myAddress/newAdd/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/newEvaluate/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/newMap/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/noDataPage/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/buyOrder/components/orderItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/buyOrder/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/foodOrder/components/orderItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/foodOrder/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderFoodDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderdetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/otherFunPage/finance/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/otherFunPage/goPublicPage/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/otherFunPage/insurance/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/payfor/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/reservationOrder/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/serviceDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/serviceList/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopMallPage/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopMallPage/shopCar/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopMallPage/shopType/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/commodityItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/loading/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/orderInfo.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/orderStatus.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/receiveGoods.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlementFood/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shop/components/merchantEvaluation.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shop/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shopDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shopList/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/storeDetail/components/merchantEvaluation.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/storeDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/l-dragSort/components/l-dragSort/l-dragSort.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
unpackage/dist/dev/mp-weixin/pages/evaluateList/components/orderItem.json vendored
View File

@ -1,4 +1,4 @@
{
"component": true,
"usingComponents": {}
"usingComponents": {},
"component": true
}

2
unpackage/dist/dev/mp-weixin/pages/order/orderdetail/index.wxml vendored
View File

File diff suppressed because one or more lines are too long

10
unpackage/dist/dev/mp-weixin/pages/serviceDetail/index.js vendored
View File

@ -218,8 +218,8 @@ var _default = {
detailInfo: {},
// 服务区信息对象
firstTabList: [{
label: "加油",
value: 1
label: "活动",
value: 5
}, {
label: "充电",
value: 2
@ -230,11 +230,11 @@ var _default = {
label: "汽修",
value: 4
}, {
label: "活动",
value: 5
label: "加油",
value: 1
}],
// 加油 充电 停车场 的tab
firstTab: 1,
firstTab: 5,
secondTabList: [{
label: "卫生间",
value: 1

80
unpackage/dist/dev/mp-weixin/pages/shopMallPage/index/index.js vendored
View File

@ -460,7 +460,8 @@ var _default = {
shopTabbar: shopTabbar
},
data: function data() {
return {
var _ref;
return _ref = {
showContent: false,
// 是否显示内容（控制骨架屏切换）
isFirstLoad: true,
@ -485,7 +486,7 @@ var _default = {
selectProducts: 0,
// 选择的甄选商品类型
pageType: "",
// 页面类型
// 页面类型
brandList: [{
label: "蓝月亮",
value: 1,
@ -540,7 +541,7 @@ var _default = {
// 当前显示几个 10个商品
shopMsg: {
pageIndex: 1,
pageSize: 6,
pageSize: 10,
isOver: false
},
havePrice: false,
@ -586,8 +587,28 @@ var _default = {
label: "",
src: ""
}],
showModalActivityImg: false
};
showModalActivityImg: false,
shopSortTypeList: [{
label: "综合排序",
value: 1
}, {
label: "价格排序",
value: 2
}, {
label: "销量排序",
value: 3
}, {
label: "上架时间排序",
value: 4
}],
selectShopSort: 0
}, (0, _defineProperty2.default)(_ref, "sortTypeList", [{
label: "由低到高",
value: 1
}, {
label: "由高到低",
value: 2
}]), (0, _defineProperty2.default)(_ref, "selectSortType", 1), _ref;
},
computed: _objectSpread({}, (0, _vuex.mapGetters)({
user: "user"
@ -772,6 +793,48 @@ var _default = {
this.isFirstLoad = true;
},
methods: {
// 改变商品排序规则
handleChangeSortType: function handleChangeSortType(e) {
this.selectSortType = Number(e.detail.value);
},
// 改变商品排序类型
handleChangeShopSort: function handleChangeShopSort(e) {
var type = Number(e.detail.value);
if (type === 0) {
this.sortTypeList = [{
label: "由低到高",
value: 1
}, {
label: "由高到低",
value: 2
}];
} else if (type === 1) {
this.sortTypeList = [{
label: "由低到高",
value: 1
}, {
label: "由高到低",
value: 2
}];
} else if (type === 2) {
this.sortTypeList = [{
label: "由低到高",
value: 1
}, {
label: "由高到低",
value: 2
}];
} else if (type === 3) {
this.sortTypeList = [{
label: "由远到近",
value: 1
}, {
label: "由近到远",
value: 2
}];
}
this.selectShopSort = type;
},
handleShowModalActivityImg: function handleShowModalActivityImg(e) {
console.log('eee', e);
this.showModalActivityImg = true;
@ -1057,7 +1120,10 @@ var _default = {
// 大小类id
justCommodity: 1,
// 写死
sortStr: "".concat(_this5.sortTypeList[_this5.sortType], " ").concat(new Date().getTime % 2 > 0 ? "" : "desc") // 排序
// sortStr: `${this.sortTypeList[this.sortType]} ${new Date().getTime % 2 > 0 ? "" : "desc"
// }`, // 排序
sortStr: "".concat(_this5.selectShopSort === 0 ? 'COMMODITY_BARCODE' : _this5.selectShopSort === 1 ? 'COMMODITY_MEMBERPRICE' : _this5.selectShopSort === 2 ? 'COMMODITY_EN' : _this5.selectShopSort === 3 ? 'OPERATE_DATE' : '', " ").concat(_this5.selectSortType === 0 ? 'asc' : 'desc')
});
case 3:
data = _context4.sent;
@ -1157,7 +1223,7 @@ var _default = {
_this7.showShopList = [];
_this7.shopMsg = {
pageIndex: 1,
pageSize: 6,
pageSize: 10,
isOver: false
};
// 拿到工会之家的商品列表

2
unpackage/dist/dev/mp-weixin/pages/shopMallPage/index/index.wxml vendored
View File

File diff suppressed because one or more lines are too long

57
unpackage/dist/dev/mp-weixin/pages/shopMallPage/index/index.wxss vendored
View File

@ -1562,7 +1562,7 @@
}
.main .priceRangeBox.data-v-79c11018 {
width: 100%;
height: 600rpx;
height: 800rpx;
background-color: #fff;
border-radius: 32rpx 32rpx 0 0;
box-sizing: border-box;
@ -1570,6 +1570,52 @@
transition: bottom 0.2s;
position: fixed;
}
.main .priceRangeBox .closeIcon.data-v-79c11018 {
width: 48rpx;
height: 48rpx;
position: absolute;
top: 32rpx;
right: 32rpx;
}
.main .priceRangeBox .sortBox.data-v-79c11018 {
width: 100%;
height: 180rpx;
box-sizing: border-box;
padding-top: 48rpx;
display: flex;
align-items: center;
margin-bottom: 10rpx;
}
.main .priceRangeBox .sortBox .sortItemBox.data-v-79c11018 {
width: 50%;
height: 100%;
box-sizing: border-box;
padding-right: 32rpx;
}
.main .priceRangeBox .sortBox .sortItemBox .sortItemTitle.data-v-79c11018 {
font-size: 28rpx;
}
.main .priceRangeBox .sortBox .sortItemBox .sortItemValue.data-v-79c11018 {
background-color: #f5f6f7;
box-sizing: border-box;
padding: 16rpx;
border-radius: 16rpx;
margin-top: 16rpx;
display: flex;
align-items: center;
justify-content: space-between;
display: block;
font-size: 28rpx;
}
.main .priceRangeBox .sortBox .sortItemBox .sortItemValue .picker.data-v-79c11018 {
width: 100%;
text-align: center;
}
.main .priceRangeBox .sortBox .sortItemBox .sortItemValue .picker .pickerIcon.data-v-79c11018 {
width: 24rpx;
height: 24rpx;
margin-left: 8rpx;
}
.main .priceRangeBox .titleBox.data-v-79c11018 {
width: 100%;
display: flex;
@ -1579,23 +1625,20 @@
.main .priceRangeBox .titleBox .title.data-v-79c11018 {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 32rpx;
font-size: 28rpx;
color: #130f05;
line-height: 44rpx;
text-align: left;
font-style: normal;
}
.main .priceRangeBox .titleBox .closeIcon.data-v-79c11018 {
width: 48rpx;
height: 48rpx;
}
.main .priceRangeBox .inputBox.data-v-79c11018 {
width: 100%;
background-color: #f5f6f7;
box-sizing: border-box;
padding: 16rpx;
border-radius: 16rpx;
margin-top: 32rpx;
margin-top: 16rpx;
font-size: 28rpx;
display: flex;
align-items: center;
justify-content: space-between;

10
unpackage/dist/dev/mp-weixin/pages/shopMallPage/shopType/index.js vendored
View File

@ -134,7 +134,15 @@ var render = function () {
item.IMAGE_PATH.split(",").length > 1
: null
var g1 = item.IMAGE_PATH && g0 ? item.IMAGE_PATH.split(",") : null
var g2 = item.SKULIST && item.SKULIST.length > 0
var g2 = (
!item.bigNumber && !item.smallNumber
? _vm.user.TEST_MEMBER
? true
: false
: true
)
? item.SKULIST && item.SKULIST.length > 0
: null
return {
$orig: $orig,
g0: g0,

2
unpackage/dist/dev/mp-weixin/pages/shopMallPage/shopType/index.wxml vendored
View File

File diff suppressed because one or more lines are too long

15
unpackage/dist/dev/mp-weixin/pages/shopPages/shopDetail/index.js vendored
View File

@ -153,6 +153,11 @@ var render = function () {
? _vm.good.ContentImgList && _vm.good.ContentImgList.length > 0
: null
var g7 =
(!_vm.good.bigNumber && !_vm.good.smallNumber
? _vm.user.TEST_MEMBER
? true
: false
: true) &&
_vm.good.PAY_METHOD !== 2000 &&
_vm.pageType !== "pointsMall" &&
!_vm.offShop &&
@ -161,6 +166,11 @@ var render = function () {
? new Date().getTime()
: null
var g8 =
(!_vm.good.bigNumber && !_vm.good.smallNumber
? _vm.user.TEST_MEMBER
? true
: false
: true) &&
_vm.good.PAY_METHOD !== 2000 &&
_vm.pageType !== "pointsMall" &&
!_vm.offShop &&
@ -169,6 +179,11 @@ var render = function () {
? new Date(_vm.good.OFF_DATE).getTime()
: null
var g9 =
(!_vm.good.bigNumber && !_vm.good.smallNumber
? _vm.user.TEST_MEMBER
? true
: false
: true) &&
_vm.good.PAY_METHOD !== 2000 &&
_vm.pageType !== "pointsMall" &&
!_vm.offShop

2
unpackage/dist/dev/mp-weixin/pages/shopPages/shopDetail/index.wxml vendored
View File

File diff suppressed because one or more lines are too long

21
unpackage/dist/dev/mp-weixin/project.private.config.json vendored
View File

@ -8,6 +8,27 @@
"condition": {
"miniprogram": {
"list": [
{
"name": "pages/shopMallPage/index/index",
"pathName": "pages/shopMallPage/index/index",
"query": "pageType=UnionMall",
"scene": null,
"launchMode": "default"
},
{
"name": "pages/order/orderdetail/index",
"pathName": "pages/order/orderdetail/index",
"query": "sellchildid=131942&orderInternal=131940&orderStatus=1010&SUPPLIER_NAME=undefined",
"launchMode": "default",
"scene": null
},
{
"name": "pages/eventRegistration/index",
"pathName": "pages/eventRegistration/index",
"query": "",
"launchMode": "default",
"scene": null
},
{
"name": "pages/serviceDetail/index",
"pathName": "pages/serviceDetail/index",