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

Compare commits

base: ylj:8f64efb87038d406c496177b418dbc353e5ade63
Branches Tags
ylj:main
..
compare: ylj:a0f8f0e833b8b70feb07b3950633969da31936b5
Branches Tags
ylj:main

No commits in common. "8f64efb87038d406c496177b418dbc353e5ade63" and "a0f8f0e833b8b70feb07b3950633969da31936b5" have entirely different histories.
8f64efb870 ... a0f8f0e833

193 changed files with 13138 additions and 6781 deletions
Show Stats Expand all files Collapse all files

21
App.vue
View File

@ -14,10 +14,7 @@ export default {
sessionUser: "user",
}),
},
onLaunch: function (options) {
console.log("onLaunch", options);
this.setVisitChannels(options.scene);
onLaunch: function () {
let _this = this;
uni.getSystemInfo({
success: (res) => {
@ -29,11 +26,7 @@ export default {
},
});
this.globalData.initReady = this.login().then(() => {});
// this.globalData.recommendCode = "1";
// this.globalData.recommendId = "2";
this.globalData.recommendCode = options.query.recommendCode;
this.globalData.recommendId = options.query.recommendId;
const updateManager = uni.getUpdateManager();
updateManager.onCheckForUpdate((res) => {
// 请求完新版本信息的回调
@ -52,15 +45,8 @@ export default {
},
onShow: function () {},
onHide: function () {},
onUnload: function () {
this.globalData.recommendCode = null;
this.globalData.recommendId = null;
},
methods: {
...mapMutations({
setArea: "setHomeServer",
setVisitChannels: "setVisitChannels",
}),
...mapMutations({ setArea: "setHomeServer" }),
login() {
let _this = this;
return new Promise((resolve, reject) => {
@ -138,9 +124,6 @@ export default {
_data.Data.MEMBERSHIP_MOBILEPHONE || "";
// _this.setUser(user);
_this.$store.commit("setUser", user);
console.log("_this.globalData");
} else {
// _this.setUser({});
_this.$store.commit("setUser", user);

BIN
caiyunyi.zip Normal file
View File

Binary file not shown.

20
components/tabbar.vue
View File

@ -19,13 +19,11 @@
>
</div>
<div class="postiton">
<view class="tabbarLogo" @click="handleGoShop"></view>
<!-- <image
<image
class="tabbarLogo"
src="/static/images/tabbar/CYYIconNew.jpg"
src="/static/images/tabbar/CYYIcon.png"
@click="handleGoShop"
/> -->
<!-- src="https://eshangtech.com/minTestImg/CYYIconNew.jpg" -->
/>
</div>
<div class="tabItem" @click="goPages('/pages/user/index')">
<image
@ -131,21 +129,13 @@ export default {
box-sizing: border-box;
padding-bottom: 68rpx;
position: relative;
border-radius: 50%;
.tabbarLogo {
width: 120rpx; //112
height: 120rpx;
background-image: url(https://eshangtech.com/minTestImg/CYYIconNew.jpg);
background-repeat: no-repeat;
background-size: contain;
width: 112rpx;
height: 112rpx;
position: absolute;
left: 50%;
transform: translateX(-50%);
top: -36rpx;
border-radius: 50%;
}
}
}

38
pages.json
View File

@ -27,20 +27,12 @@
{
"root": "pages/allFunPage",
"pages": [{
"path": "index",
"style": {
"navigationBarTitleText": "全部功能",
"disableScroll": true
}
},
{
"path": "unionActivities",
"style": {
"navigationBarTitleText": "工会活动",
"disableScroll": true
}
"path": "index",
"style": {
"navigationBarTitleText": "全部功能",
"disableScroll": true
}
]
}]
},
{
"root": "pages/register",
@ -108,11 +100,6 @@
"style": {
"navigationBarTitleText": "订单详情"
}
}, {
"path": "orderdetail/reasonforRefund",
"style": {
"navigationBarTitleText": "退款原因"
}
}, {
"path": "orderFoodDetail/index",
"style": {
@ -204,15 +191,6 @@
}
}]
},
{
"root": "pages/etcMap/",
"pages": [{
"path": "index",
"style": {
"navigationBarTitleText": "ETC地图"
}
}]
},
{
"root": "pages/serviceList/",
"pages": [{
@ -244,12 +222,6 @@
"style": {
"navigationBarTitleText": "头条详情"
}
},
{
"path": "minprogress",
"style": {
"navigationBarTitleText": ""
}
}
]
},

1
pages/allFunPage/index.vue
View File

@ -60,7 +60,6 @@ export default {
console.log("this.allFunList", this.allFunList);
this.showList = true;
this.$forceUpdate();
this.$utils.addUserBehaviorNew();
},
onUnload() {
uni.setStorageSync("funList", JSON.stringify(this.allFunList));

508
pages/allFunPage/unionActivities.vue
View File

@ -1,508 +0,0 @@
<template>
<view class="main">
<div class="advertisement">
<div class="advertisementContentBox">
<div class="advertisementTop">
<div class="title">
商务活动策划
<!-- {{ activityObj.UserdefinedType_Name || "" }} -->
</div>
</div>
<scroll-view class="shopList" scroll-x>
<div
:style="{
width: activityShopList.length * 160 + 'rpx',
height: '100%',
whiteSpace: 'noWrap',
}"
>
<div
class="shopItem"
v-for="(item, index) in activityShopList"
:key="index"
@click.stop="handleGoShopDetail(item)"
>
<div class="shopItemImg">
<div class="imgBox">
<image
class="shopImg"
:src="
item.IMAGE_PATH || '/static/images/home/defultImg.png'
"
/>
</div>
<text class="discountedPrice"
>¥{{ item.bigNumber || "" }}.{{
item.smallNumber || "00"
}}</text
>
</div>
</div>
</div>
</scroll-view>
</div>
<div class="advertisementContentBox">
<div class="advertisementTop">
<div class="title">
团建
<!-- {{ activityObj.UserdefinedType_Name || "" }} -->
</div>
</div>
<scroll-view class="shopList" scroll-x>
<div
:style="{
width: activityShopList.length * 160 + 'rpx',
height: '100%',
whiteSpace: 'noWrap',
}"
>
<div
class="shopItem"
v-for="(item, index) in activityShopList"
:key="index"
@click.stop="handleGoShopDetail(item)"
>
<div class="shopItemImg">
<div class="imgBox">
<image
class="shopImg"
:src="
item.IMAGE_PATH || '/static/images/home/defultImg.png'
"
/>
</div>
<text class="discountedPrice"
>¥{{ item.bigNumber || "" }}.{{
item.smallNumber || "00"
}}</text
>
</div>
</div>
</div>
</scroll-view>
</div>
<div class="advertisementContentBox">
<div class="advertisementTop">
<div class="title">
茶歇
<!-- {{ activityObj.UserdefinedType_Name || "" }} -->
</div>
</div>
<scroll-view class="shopList" scroll-x>
<div
:style="{
width: activityShopList.length * 160 + 'rpx',
height: '100%',
whiteSpace: 'noWrap',
}"
>
<div
class="shopItem"
v-for="(item, index) in activityShopList"
:key="index"
@click.stop="handleGoShopDetail(item)"
>
<div class="shopItemImg">
<div class="imgBox">
<image
class="shopImg"
:src="
item.IMAGE_PATH || '/static/images/home/defultImg.png'
"
/>
</div>
<text class="discountedPrice"
>¥{{ item.bigNumber || "" }}.{{
item.smallNumber || "00"
}}</text
>
</div>
</div>
</div>
</scroll-view>
</div>
</div>
</view>
</template>
<script>
export default {
data() {
return {
activityShopList: [],
};
},
};
</script>
<style lang="less" scoped>
.main {
width: 100vw;
height: 100vh;
box-sizing: border-box;
background: #f2f4f5;
padding: 32rpx;
.advertisement {
width: 100%;
border-radius: 16rpx;
margin-top: 24rpx;
box-sizing: border-box;
padding: 2rpx;
.advertisementContentBox {
width: 100%;
height: 100%;
background: #fff;
// 真的有个空格！！！
background-image: url("https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/Special Offers.png");
background-repeat: no-repeat;
border-radius: 16rpx;
background-size: 100% 100%;
box-sizing: border-box;
padding: 16rpx 22rpx;
margin-bottom: 32rpx;
.advertisementTop {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
.title {
font-family: "PingFangSC";
font-weight: 400;
font-size: 28rpx;
line-height: 32rpx;
text-align: left;
font-style: normal;
color: #181716;
.titleImg {
width: 112rpx;
height: 36rpx;
}
}
.moreBox {
display: flex;
align-items: center;
.moreText {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #8b8280;
line-height: 36rpx;
text-align: left;
font-style: normal;
}
.rightIcon {
width: 24rpx;
height: 24rpx;
margin-left: 4rpx;
}
}
}
.advertisementTopUnionMall {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
.title {
font-size: 26rpx;
font-weight: 600;
color: #181716;
}
.moreBox {
display: flex;
align-items: center;
.moreText {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #8b8280;
line-height: 36rpx;
text-align: left;
font-style: normal;
}
.rightIcon {
width: 24rpx;
height: 24rpx;
margin-left: 4rpx;
}
}
}
.UnionMallShopList {
width: 100%;
margin-top: 24rpx;
height: 80px;
display: flex;
align-items: center;
.leftSortBox {
width: 50%;
background: linear-gradient(180deg, #ffffff 0%, #ffffff 100%);
border-radius: 16rpx;
box-sizing: border-box;
padding: 12rpx 24rpx;
.titleTop {
.title {
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 32rpx;
color: #130f05;
line-height: 44rpx;
text-align: left;
font-style: normal;
}
}
}
.rowBox {
width: 25%;
height: 144rpx;
// width: 96rpx;
// height: 154rpx;
// display: inline-block;
// box-sizing: border-box;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
.imgBox {
width: 96rpx;
display: flex;
justify-content: center;
.itemImgBox {
width: 96rpx;
height: 96rpx;
border-radius: 50%;
background: #fff;
padding: 2rpx;
box-sizing: border-box;
overflow: hidden;
margin-bottom: 16rpx;
.img {
width: 96rpx;
height: 100%;
}
}
}
.itemName {
width: 96rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #020e1a;
line-height: 32rpx;
text-align: center;
font-style: normal;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}
.shopList {
width: 100%;
margin-top: 24rpx;
height: 80px;
.shopItem {
width: 136rpx;
display: inline-block;
margin-right: 40rpx;
.shopItemImg {
width: 100%;
position: relative;
.imgBox {
width: 136rpx;
height: 136rpx;
border-radius: 50%;
overflow: hidden;
.shopImg {
width: 100%;
height: 100%;
}
}
.discountedPrice {
background: linear-gradient(90deg, #fd3404 0%, #fe7e1f 100%);
padding: 4rpx 12rpx;
font-family: DINAlternate, DINAlternate;
font-weight: bold;
font-size: 28rpx;
color: #ffffff;
line-height: 32rpx;
font-style: normal;
border-radius: 16rpx;
position: absolute;
bottom: -12rpx;
left: 50%;
transform: translateX(-50%);
}
}
.price {
width: 100%;
display: inline-block;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #756c6a;
line-height: 36rpx;
text-align: center;
font-style: normal;
text-decoration-line: line-through;
margin-top: 14rpx;
}
}
}
}
.advertisementContentBox ::-webkit-scrollbar {
display: none;
}
.sortBox {
width: 100%;
display: flex;
align-items: flex-start;
// align-items: center;
justify-content: space-between;
.leftSortBox {
background: linear-gradient(180deg, #ffe8e8 0%, #ffffff 100%);
border-radius: 16rpx;
box-sizing: border-box;
padding: 12rpx 24rpx;
margin-right: 16rpx;
min-width: 320rpx;
.titleTopSort {
width: 100%;
.title {
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 32rpx;
color: #130f05;
line-height: 44rpx;
text-align: left;
font-style: normal;
.red {
color: #ff3e3e;
}
}
}
.notice {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 20rpx;
color: #716f69;
line-height: 28rpx;
text-align: left;
font-style: normal;
}
.shopList {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 16rpx;
.shopItem {
width: 128rpx;
height: 128rpx;
.shopImg {
width: 128rpx;
height: 128rpx;
}
}
}
}
.rightItem {
border-radius: 16rpx;
box-sizing: border-box;
padding: 12rpx 24rpx;
min-width: 160rpx;
.titleTopSort {
width: 100%;
.title {
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 32rpx;
color: #130f05;
line-height: 44rpx;
text-align: left;
font-style: normal;
.red {
color: #ff8000;
}
}
}
.notice {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 20rpx;
color: #716f69;
line-height: 28rpx;
text-align: left;
font-style: normal;
}
.shopItem {
width: 128rpx;
height: 128rpx;
margin-top: 16rpx;
.shopImg {
width: 128rpx;
height: 128rpx;
}
}
}
.bg2 {
background: linear-gradient(180deg, #ffefe0 0%, #ffffff 100%);
}
.bg3 {
background: linear-gradient(180deg, #d8f9de 0%, #ffffff 100%);
}
}
}
}
</style>

5
pages/bindCar/index.vue
View File

@ -101,7 +101,7 @@ export default {
},
components: {
keyboard,
},
},
methods: {
// 确认绑定
handleConfirmCode() {
@ -298,9 +298,6 @@ export default {
this.isLoading = true;
this.getList();
},
onLoad(){
this.$utils.addUserBehaviorNew();
}
};
</script>

643
pages/etcMap/data.js
View File

@ -1,643 +0,0 @@
export default {
list: [{
id: 2287,
attribution: "云南公路联网收费管理有限公司",
name: "联网公司ETC客户服务网点",
area: "昆明",
address: "昆明市西山区前兴路润城第二大道3号写字楼1楼（工商银行旁）",
lng: 102.707948,
lat: 24.995861,
phone: "0871-96550",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 11:35:53",
del_flag: 0
},
{
id: 2288,
attribution: "云南省交通投资建设集团有限公司\n昆明西管理处\n",
name: "昆明西管理处昆明西ETC客户服务网点",
area: "昆明",
address: "昆明市西山区碧鸡镇昆明西管理处院内",
lng: 102.627576,
lat: 24.999914,
phone: "0871-68422255",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2289,
attribution: "云南省交通投资建设集团有限公司\n昆明西管理处\n",
name: "昆明西管理处费楚雄ETC客户服务网点",
area: "楚雄",
address: "楚雄州楚雄市永安路451号昆明西管理处楚雄分处院内",
lng: 101.520713,
lat: 25.050880,
phone: "0878-3123888",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2290,
attribution: "云南省交通投资建设集团有限公司\n昆明西管理处\n",
name: "昆明西管理处富民ETC客户服务网点",
area: "昆明",
address: "昆明市富民县富民收费站院内",
lng: 102.523844,
lat: 25.225699,
phone: "0871-68810118",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2291,
attribution: "云南省交通投资建设集团有限公司\n昆明东管理处\n",
name: "昆明东管理处昆明东综合服务网点",
area: "昆明",
address: "云南省昆明市经济技术开发区小喜村收费站内",
lng: 102.787384,
lat: 24.985114,
phone: "0871−63131149",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2292,
attribution: "云南省交通投资建设集团有限公司\n昆明东管理处\n",
name: "昆明东管理处宜良综合服务网点",
area: "昆明",
address: "云南省昆明市宜良县匡远镇蓬莱大道宜良收费站办公区（白鸭市场对面）",
lng: 103.150082,
lat: 24.928264,
phone: "0871-67599897",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2293,
attribution: "云南省交通投资建设集团有限公司\n昆明东管理处\n",
name: "昆明东管理处玉溪综合服务网点",
area: "玉溪",
address: "玉溪市明珠路158号",
lng: 102.524218,
lat: 24.328433,
phone: "0877-2076218、0877-2667990",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 15:26:43",
del_flag: 0
},
{
id: 2294,
attribution: "云南省交通投资建设集团有限公司\n昆明东管理处\n",
name: "昆明东管理处嵩明综合服务网点",
area: "昆明",
address: "嵩明西收费站院内办公楼一楼114室",
lng: 102.993190,
lat: 25.320831,
phone: "0871-67921878",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2295,
attribution: "云南省交通投资建设集团有限公司\n保山管理处",
name: "保山管理处保山ETC客户服务网点",
area: "保山",
address: "云南省保山市隆阳区保岫东路366号",
lng: 99.180932,
lat: 25.110688,
phone: "0875-2160050",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2296,
attribution: "云南省交通投资建设集团有限公司\n保山管理处",
name: "保山管理处腾冲ETC客户服务网点",
area: "腾冲",
address: "云南省保山市腾冲市腾越镇绮罗社区田心小区腾冲收费站院内",
lng: 98.503865,
lat: 24.978571,
phone: "0875-5169385",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2297,
attribution: "云南省交通投资建设集团有限公司\n保山管理处",
name: "保山管理处芒市ETC客户服务网点",
area: "芒市",
address: "云南省德宏州芒市拉怀村芒市收费站院内",
lng: 98.574661,
lat: 24.478069,
phone: "0692-2255924",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2298,
attribution: "云南省交通投资建设集团有限公司\n保山管理处",
name: "保山管理处瑞丽东ETC客户服务网点",
area: "瑞丽",
address: "云南省德宏州瑞丽市姐勒乡瑞丽东收费站院内",
lng: 97.912314,
lat: 24.040347,
phone: "0692-6990976",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2299,
attribution: "云南省交通投资建设集团有限公司\n大理管理处",
name: "大理管理处大理网点",
area: "大理",
address: "大理市南涧路39号云南交投大理管理处院内",
lng: 100.225395,
lat: 25.571738,
phone: "0872—2173105 0872—2243036",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2300,
attribution: "云南省交通投资建设集团有限公司\n丽江管理处",
name: "丽江管理处丽江综合服务网点",
area: "丽江",
address: "云南省丽江市玉龙县拉市镇海东村丽江西收费站院内",
lng: 100.163306,
lat: 26.867080,
phone: "0888-5331882",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2301,
attribution: "云南省交通投资建设集团有限公司\n临沧管理处",
name: "临沧管理处ETC客户服务网点",
area: "临沧市",
address: "云南省临沧市临翔区机场高速临沧收费站院内电子收费临沧服务中心",
lng: 100.091223,
lat: 23.848207,
phone: "19948831779",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2302,
attribution: "云南省交通投资建设集团有限公司\n普洱管理处",
name: "普洱管理处普洱ETC客户服务网点",
area: "普洱市",
address: "普洱市思茅区南屏镇茶苑路100号",
lng: 100.953670,
lat: 22.750814,
phone: "0879-3062016/3062017",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 09:17:41",
update_time: "0000-00-00 09:17:41",
del_flag: 0
},
{
id: 2303,
attribution: "云南省交通投资建设集团有限公司\n文山管理处",
name: "云南交投文山管理处文山ETC客户服务网点",
area: "文山",
address: "文山州砚山县江那镇砚山北收费站旁文山管理处大门（门卫室旁）",
lng: 104.350827,
lat: 23.660961,
phone: "0876-3135111",
opo: "",
remark: "收费站名称变更，由\"布标收费站\"变更为\"砚山北收费站\"",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2304,
attribution: "云南省交通投资建设集团有限公司\n西双版纳管理处",
name: "西双版纳管理处西双版纳综合服务网点",
area: "西双版纳州景洪市",
address: "云南省西双版纳傣族自治州景洪市勐养镇小勐养下行服务区",
lng: 100.903609,
lat: 22.082096,
phone: "0691-2192388",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2305,
attribution: "云南省交通投资建设集团有限公司昭通管理处",
name: "昭通管理处昭通ETC客户服务网点",
area: "昭通",
address: "昭通市昭阳区守望乡白泥井村，云南交投昭通管理处昭阳分处麻昭高速昭通（东）收费站旁",
lng: 103.744710,
lat: 27.306455,
phone: "0870-3011818",
opo: "NULL",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2306,
attribution: "云南省交通投资建设集团有限公司\n昭通管理处",
name: "昭通管理处水富ETC客户服务网点",
area: "昭通",
address: "昭通市水富市云富街道办事处北大门大道2附10号",
lng: 104.413674,
lat: 28.604036,
phone: "0870-8632602",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2307,
attribution: "云南省交通投资建设集团有限公司\n红河管理处",
name: "红河管理处红河ETC客户服务网点",
area: "红河",
address: "云南省红河州蒙自市新安所镇蒙自东收费站院内",
lng: 103.416537,
lat: 23.418615,
phone: "0873-3851555",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2308,
attribution: "云南省交通投资建设集团有限公司曲靖管理处",
name: "曲靖管理处曲靖ETC客户服务网点",
area: "曲靖",
address: "曲靖市麒麟区银屯路78号曲靖管理处院内",
lng: 103.803221,
lat: 25.474056,
phone: "0874-32196460874-3210001",
opo: "NULL",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2309,
attribution: "昆明高海公路建设投资开发有限责任公司",
name: "高海公司西华站ETC客户服务网点",
area: "昆明",
address: "云南西华站",
lng: 102.654669,
lat: 24.873579,
phone: "13668786715",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2310,
attribution: "昆明黄马高速公路有限公司",
name: "黄马高速大营收费站ETC综合服务网点",
area: "昆明",
address: "昆明市高新区马金铺街道大营社区昆明黄马高速公路大营收费站",
lng: 102.820622,
lat: 24.793867,
phone: "0871-65957931",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2311,
attribution: "云南昆玉高速公路开发有限公司",
name: "昆玉高速昆明南收费站综合服务点",
area: "昆明",
address: "昆玉高速昆明南收费站",
lng: 102.787944,
lat: 24.793509,
phone: "0871-67494879",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2312,
attribution: "昆明石泸高速公路开发有限公司",
name: "石泸高速阿着底收费站ETC综合服务网点",
area: "昆明、石林",
address: "昆明石泸高速公路开发有限公司阿着底收费站",
lng: 103.372727,
lat: 24.621459,
phone: "0871-67708580",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2313,
attribution: "昆明宜石高速公路开发有限公司",
name: "宜石高速大叠水收费站ETC综合服务网点",
area: "昆明、石林",
address: "昆明宜石高速公路开发有限公司大叠水收费站",
lng: 103.253538,
lat: 24.704094,
phone: "0871-67708580",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2314,
attribution: "昭通市航空旅游集团有限公司",
name: "昭通航空旅游集团",
area: "昭通",
address: "云南省昭通市昭阳区苏家院镇木瓜林村（大山包一级公路收费站旁）",
lng: 103.572692,
lat: 27.293549,
phone: "0870-8892991",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2315,
attribution: "昆明东南绕城高速公路开发有限公司",
name: "东南绕高速宜良南站ETC客户服务网点",
area: "昆明",
address: "云南宜良南站",
lng: 103.141296,
lat: 24.919715,
phone: "0871-6761143",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2316,
attribution: "文山天文高速公路投资开发有限公司",
name: "天文高速文山南服务区ETC客户服务网点",
area: "文山州",
address: "文山市古木镇牛棚村委会小横塘村",
lng: 104.090921,
lat: 23.458931,
phone: "0876-2666638",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 16:15:59",
del_flag: 0
},
{
id: 2317,
attribution: "昆明元朔建设发展有限公司",
name: "昆明南连接线高速周家村收费站ETC客户服务网点",
area: "昆明",
address: "云南省周家村收费站管理用房一楼",
lng: 102.67432,
lat: 24.991334,
phone: "0871-64332737",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 18:08:21",
del_flag: 0
},
{
id: 2324,
attribution: "曲靖市公路建设开发有限责任公司",
name: "翠峰客服网点",
area: "曲靖",
address: "云南省曲靖市麒麟区学府路与翠峰西路交叉西北角",
lng: 103.758097,
lat: 25.509847,
phone: "0874-3335522",
opo: "NULL",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2327,
attribution: "曲靖市公路建设开发有限责任公司",
name: "马龙客服网点",
area: "曲靖",
address: "曲嵩高速公路马龙收费站内",
lng: 103.567379,
lat: 25.431781,
phone: "0874-8072588",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 10:55:44",
del_flag: 0
},
{
id: 2331,
attribution: "曲靖市公路建设开发有限责任公司",
name: "师宗南收费站网点",
area: "曲靖",
address: "麒师高速公路师宗南收费站内",
lng: 104.034254,
lat: 24.840647,
phone: "0874-5066099",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 11:05:39",
del_flag: 0
},
{
id: 2335,
attribution: "中交云南高速公路发展有限公司",
name: "大板桥服务区网点",
area: "昆明",
address: "新昆嵩高速大板桥服务区",
lng: 103.011991,
lat: 25.12982,
phone: "13987431272",
opo: "NULL",
remark: "NULL",
status: 1,
create_time: "0000-00-00 10:55:44",
update_time: "0000-00-00 18:00:54",
del_flag: 0
},
{
id: 2336,
attribution: "云南公路联网收费管理有限公司",
name: "昆明市呈贡区政务服务中心ETC客户服务网点",
area: "昆明",
address: "云南省昆明市呈贡区乌龙街道呈详街惠景园D7栋（昆明市呈贡区政务服务中心）",
lng: 102.813812,
lat: 24.878562,
phone: "0871-96550",
opo: "",
remark: "",
status: 1,
create_time: "0000-00-00 15:52:48",
update_time: "0000-00-00 15:52:48",
del_flag: 0
},
{
id: 2338,
attribution: "云泉收费站",
name: "云泉收费站ETC客户服务网点",
area: "曲靖",
address: "曲靖市马龙区大庄乡云泉村",
lng: 103.464115,
lat: 25.212195,
phone: "18183706124",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 13:50:10",
update_time: "0000-00-00 13:50:10",
del_flag: 0
},
{
id: 2339,
attribution: "文山东收费站",
name: "文山东收费站ETC客户服务网点",
area: "文山",
address: "云南省文山州文山市开化镇文山东收费站",
lng: 104.233454,
lat: 23.427797,
phone: "18487144756",
opo: "",
remark: "NULL",
status: 1,
create_time: "0000-00-00 13:50:51",
update_time: "0000-00-00 13:50:51",
del_flag: 0
},
{
id: 2340,
attribution: "ETC客户服务网点",
name: "西双版纳傣族自治州政务服务中心",
area: "西双版纳州景洪市",
address: "云南省西双版纳州景洪市西双版纳度假区景帕杭路2号(曼弄枫国际会展中心A区)",
lng: 100.805474,
lat: 21.976842,
phone: "13988171931",
opo: "",
remark: "",
status: 1,
create_time: "0000-00-00 16:21:21",
update_time: "0000-00-00 16:21:21",
del_flag: 0
},
{
id: 2341,
attribution: "昆明市螺蛳湾政务中心ETC客服网点",
name: "昆明市螺蛳湾政务中心ETC客服网点",
area: "昆明",
address: "云南省昆明市官渡区新螺蛳湾国际商贸城一期4号门三楼（螺蛳湾政务服务中心）",
lng: 102.777509,
lat: 24.935118,
phone: "0871-96550",
opo: "",
remark: "",
status: 1,
create_time: "0000-00-00 10:48:03",
update_time: "0000-00-00 10:48:03",
del_flag: 0
}
]
}

321
pages/etcMap/index.vue
View File

@ -1,321 +0,0 @@
<template>
<view class="main">
<view class="mapBox">
<map
id="myMap"
:longitude="longitude"
:latitude="latitude"
:markers="markers"
class="map"
show-location
></map>
</view>
<view
:style="{
transform: showLong ? 'translateY(-20vh)' : 'translateY(-32rpx)',
height: showLong ? '80vh' : '60vh',
}"
class="bigBox"
>
<view class="topBox" @click="handleChangeLong">
<image
class="packUp"
src="https://eshangtech.com/ShopICO/ahyd-BID/service/packUp.svg"
/>
</view>
<scroll-view
class="listBox"
:scroll-y="true"
:style="{
height: showLong ? 'calc(80vh - 32rpx)' : 'calc(60vh - 32rpx)',
}"
>
<view class="list">
<view
:class="selectId === item.id ? 'itemBox selectItemBox' : 'itemBox'"
v-for="(item, index) in dataList"
:key="index"
@click="handleChangePlace(item)"
>
<view class="itemLeft">
<view class="title">{{ item.name || "" }}</view>
<view class="phone">{{ item.phone || "" }}</view>
<view class="distance"
>{{ item.distance ? item.distance + "km" : "" }}
<span v-if="item.recently" class="recently">距离最近</span>
</view>
</view>
<view class="itemRight" @click="handleGoMap(item)">
<image
class="mapIcon"
src="/static/images/home/navigationIcon.svg"
/>
</view>
</view>
</view>
</scroll-view>
</view>
</view>
</template>
<script>
import ETCdata from "./data";
export default {
data() {
return {
mapCtx: "",
showLong: false, // 是否显示更长
dataList: [],
longitude: "",
latitude: "",
seatInfo: {}, // 用户实际经纬度
selectId: 0, // 选择的id
markers: [],
};
},
onLoad() {
this.mapCtx = uni.createMapContext("myMap");
console.log("this.dataList", this.dataList);
let seatInfo = uni.getStorageSync("seatInfo");
if (seatInfo) {
this.seatInfo = JSON.parse(seatInfo);
}
let list = ETCdata.list;
console.log("this.seatInfo", this.seatInfo);
// this.longitude = this.seatInfo.longitude;
// this.latitude = this.seatInfo.latitude;
if (list && list.length > 0) {
list.forEach((item) => {
let distance = this.getDistance(
this.seatInfo.longitude,
this.seatInfo.latitude,
item.lng,
item.lat
);
item.distance = distance;
});
}
for (let i = 0; i < list.length - 1; i++) {
for (let j = 0; j < list.length - i - 1; j++) {
if (list[j].distance > list[j + 1].distance) {
let temp = list[j];
list[j] = list[j + 1];
list[j + 1] = temp;
}
}
}
list[0].recently = true;
this.dataList = list;
this.longitude = this.dataList[0].lng;
this.latitude = this.dataList[0].lat;
this.selectId = this.dataList[0].id;
this.markers = [
{
id: this.dataList[0].id, // 使用时间戳作为唯一ID
latitude: this.dataList[0].lat,
longitude: this.dataList[0].lng,
width: 20,
height: 30,
label: {
// 文本标签
content: this.dataList[0].name,
color: "#3EC273",
fontSize: 14,
bgColor: "#ffffff",
borderRadius: 4,
padding: 5,
textAlign: "center",
},
},
];
},
methods: {
// 计算经纬度的实际距离的方法
getDistance(lat1, lon1, lat2, lon2) {
const toRad = (d) => (d * Math.PI) / 180; // 角度转弧度
const R = 6371.0; // 地球半径（单位：km）
const dLat = toRad(lat2 - lat1);
const dLon = toRad(lon2 - lon1);
const a =
Math.sin(dLat / 2) * Math.sin(dLat / 2) +
Math.cos(toRad(lat1)) *
Math.cos(toRad(lat2)) *
Math.sin(dLon / 2) *
Math.sin(dLon / 2);
const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
return (R * c).toFixed(2); // 返回单位：米
},
// 打开地图的跳转
handleGoMap(obj) {
uni.openLocation({
latitude: obj.lat * 1,
longitude: obj.lng * 1,
scale: 16, // 缩放比例
name: obj.name,
// address: "", // 这个可能会影响地图的定位，所以可以选择不填
success(data) {
console.log(data);
},
fail(err) {
console.log(err);
},
});
},
// 修改显示列表长度
handleChangeLong() {
this.showLong = !this.showLong;
this.$forceUpdate();
},
// 切换点位
handleChangePlace(obj) {
this.longitude = obj.lng;
this.latitude = obj.lat;
this.selectId = obj.id;
this.markers = [
{
id: obj.id, // 使用时间戳作为唯一ID
latitude: obj.lat,
longitude: obj.lng,
width: 20,
height: 30,
label: {
// 文本标签
content: obj.name,
color: "#3EC273",
fontSize: 14,
bgColor: "#ffffff",
borderRadius: 4,
padding: 5,
textAlign: "center",
},
},
];
},
},
};
</script>
<style lang="less" scoped>
.main {
width: 100vw;
height: 100vh;
background: #f5f7f9;
.mapBox {
width: 100%;
height: 40vh;
.map {
width: 100%;
height: 100%;
}
}
.bigBox {
width: 100%;
background: #fff;
border-top-right-radius: 32rpx;
border-top-left-radius: 32rpx;
.topBox {
width: 100%;
height: 32rpx;
display: flex;
align-items: center;
justify-content: center;
.packUp {
width: 32rpx;
height: 64rpx;
}
}
.listBox {
width: 100%;
box-sizing: border-box;
padding: 32rpx;
.itemBox {
width: 100%;
box-sizing: border-box;
margin-bottom: 32rpx;
border-radius: 16rpx;
border: 1px solid #dfe0e0;
padding: 16rpx;
display: flex;
align-items: center;
justify-content: space-between;
.itemLeft {
width: calc(100% - 80rpx);
.title {
width: 100%;
font-family: "PingFangSC";
font-weight: 400;
font-size: 30rpx;
color: #130f05;
line-height: 40rpx;
text-align: left;
font-style: normal;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.phone {
width: 100%;
font-family: "PingFangSC";
font-weight: 400;
font-size: 24rpx;
color: #716f69;
line-height: 36rpx;
text-align: left;
font-style: normal;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.distance {
width: 100%;
font-family: "PingFangSC";
font-weight: 400;
font-size: 24rpx;
color: #716f69;
line-height: 36rpx;
text-align: left;
font-style: normal;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
.recently {
background: #e8f8ee;
border-radius: 4rpx;
padding: 2rpx 8rpx;
color: #3ec272;
font-size: 24rpx;
margin-left: 16rpx;
}
}
}
.itemRight {
width: 64rpx;
height: 64rpx;
.mapIcon {
width: 64rpx;
height: 64rpx;
}
}
}
.selectItemBox {
border: 1px solid #43c577;
}
}
.listBox ::-webkit-scrollbar {
display: none;
width: 0;
}
}
}
</style>

1
pages/evaluateList/addEvaluate.vue
View File

@ -514,7 +514,6 @@ export default {
// this.saveMsg.salebillId = option.orderInternal;
// this.saveMsg.action_type = "addMallComment";
// }
this.$utils.addUserBehaviorNew();
},
};
</script>

3
pages/evaluateList/index.vue
View File

@ -92,8 +92,7 @@ export default {
this.pageType = query.pageType;
}
console.log("this.pageType", this.pageType);
this.getorderList();
this.$utils.addUserBehaviorNew();
this.getorderList();
},
methods: {
async handleRefresherrefresh() {

1
pages/evaluateList/selectEvaluate.vue
View File

@ -44,7 +44,6 @@ export default {
this.sellchildid = option.sellchildid;
}
this.orderInternal = option.orderInternal;
this.$utils.addUserBehaviorNew();
},
onShow() {
// 获取订单详情

1
pages/highwayHeadlines/detail.vue
View File

@ -31,7 +31,6 @@ export default {
if (query.id) {
this.hanldeGetDetail(query.id);
}
this.$utils.addUserBehaviorNew();
},
methods: {
// 预览查看

19
pages/highwayHeadlines/index.vue
View File

@ -66,7 +66,6 @@ export default {
onLoad() {
// 拿到tab的数据
this.handleGetTabList();
this.$utils.addUserBehaviorNew();
},
methods: {
// 改变选中
@ -125,26 +124,14 @@ export default {
} else {
this.messageList = [];
}
this.messageList.push({
NOTICEINFO_TITLE: "最新放假通知：调休2天，免费8天！",
messageType: "official",
});
console.log("this.messageList", this.messageList);
},
// 跳转查看高速头条详情
handleGoDetail(obj) {
console.log("obj", obj);
if (obj.messageType === "official") {
uni.navigateTo({
url: "/pages/highwayHeadlines/minprogress",
});
} else {
uni.navigateTo({
url: `/pages/highwayHeadlines/detail?id=${obj.NOTICEINFO_ID}`,
});
}
uni.navigateTo({
url: `/pages/highwayHeadlines/detail?id=${obj.NOTICEINFO_ID}`,
});
},
},
};

31
pages/highwayHeadlines/minprogress.vue
View File

@ -1,31 +0,0 @@
<!--
* @Author: cclu 1106109051@qq.com
* @Date: 2025-03-27 16:06:32
* @LastEditors: cclu 1106109051@qq.com
* @LastEditTime: 2025-03-27 16:09:06
* @FilePath: \caiyunyi\pages\highwayHeadlines\minprogress.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<div class="main">
<web-view
id="myWebView"
ref="myWebView"
src="https://mp.weixin.qq.com/s/deGzF0cWoG1kXUAd1eUGqQ"
></web-view>
</div>
</template>
<script>
export default {
data() {
return {};
},
};
</script>
<style scoped lang="less">
.main {
width: 100vw;
height: 100vh;
}
</style>

161
pages/index/index.vue
View File

@ -242,7 +242,6 @@
src="/static/images/home/broadcastIcon.svg"
/>
<text class="roadTitle">高速路况播报</text>
<!-- <text class="roadTitle">女神节团购活动</text> -->
</view>
<view class="roadTopRight">
<image class="roadIcon" src="/static/images/home/rightArrow.svg" />
@ -295,8 +294,7 @@
class="mallIcon"
src="/static/images/home/broadcastIcon.svg"
/>
<!-- <text class="roadTitle">驿购商城</text> -->
<text class="roadTitle">彩云驿商城</text>
<text class="roadTitle">驿购商城</text>
</view>
<view class="mallTopRight">
<image class="mallIcon" src="/static/images/home/rightArrow.svg" />
@ -419,25 +417,6 @@
<image class="backIcon" src="/static/images/home/backTopIcon.png" />
</view>
<!-- 广告 -->
<uni-popup ref="noticeRef">
<view class="noticePopup" @click="handleHidePopup"> </view>
</uni-popup>
<!-- ETC -->
<uni-popup ref="ETCRef">
<view class="ETCPopup">
<view class="ETCItem" @click="handleGoETC(1)">
<image class="itemImg" src="/static/images/home/newEtc.svg" />
<text class="itemText">ETC小程序</text>
</view>
<view class="ETCItem" @click="handleGoETC(2)">
<image class="itemImg" src="/static/images/home/ETCmap.svg" />
<text class="itemText">ETC网点</text>
</view>
</view>
</uni-popup>
<tabbar :page="'/pages/index/index'" />
</view>
</template>
@ -586,25 +565,9 @@ export default {
safeHeight: 0, // ios的安全距离
showBackTop: false, // 页面滚动距离
scrollView: "",
showPoster: true, // 判断是否显示海报
isChangeIcon: true, // 判断是否切换商城的图表
};
},
async onLoad() {
let stronge = uni.getStorageSync("showIndexPoster");
console.log("stronge", stronge);
// this.$refs.noticeRef.open("center");
// if (
// stronge === 1 ||
// stronge === "1" ||
// new Date("2025-03-02 8:00:00").getTime() < new Date().getTime()
// ) {
// this.showPoster = false;
// } else {
// this.$refs.noticeRef.open("center");
// }
this.menu = uni.getMenuButtonBoundingClientRect();
let systemInfo = uni.getSystemInfoSync();
console.log("systemInfo", systemInfo);
@ -652,8 +615,6 @@ export default {
this.handleGetProductsList();
// 商城的内容
this.handleGetShoppingMall();
this.$utils.addUserBehaviorNew();
},
async onShow() {
let currentService = uni.getStorageSync("currentService");
@ -678,25 +639,6 @@ export default {
this.funList = newFunList;
console.log("this.funList", this.funList);
}
// if (new Date("2025-03-02 8:00:00").getTime() < new Date().getTime()) {
// this.isChangeIcon = false;
// }
// if (this.isChangeIcon) {
// let fun = this.funList;
// fun.forEach((item) => {
// if (item.value === 15) {
// item.label = "女神活动";
// item.src = "https://eshangtech.com/minTestImg/GoddessFestival.png";
// item.springSrc =
// "https://eshangtech.com/minTestImg/GoddessFestival.png";
// }
// });
// console.log("fun", fun);
// this.funList = fun;
// this.$forceUpdate();
// }
},
computed: {
...mapGetters({
@ -711,26 +653,19 @@ export default {
onShareAppMessage() {
// let _this = this;
return {
title: "彩云驿出行",
title: "彩云驿商城",
path: "/pages/index/index",
// imageUrl: _this.good.DEFAULT_IMG,
};
},
onShareTimeline() {
return {
title: "彩云驿出行",
title: "彩云驿商城",
path: "/pages/index/index",
// imageUrl: _this.good.DEFAULT_IMG,
};
},
methods: {
handleHidePopup() {
uni.setStorageSync("showIndexPoster", 1);
this.$refs.noticeRef.close();
uni.navigateTo({
url: `/pages/shopMallPage/shopType/index`,
});
},
// 回到顶部
handleGoBack() {
this.scrollView = "navItem";
@ -851,18 +786,6 @@ export default {
url: `/pages/serviceDetail/index`,
});
},
// ETC的功能
handleGoETC(value) {
if (value === 1) {
uni.navigateToMiniProgram({
appId: "wxb228568a0a4f7120",
});
} else if (value === 2) {
uni.navigateTo({
url: `/pages/etcMap/index`,
});
}
},
// 功能列表
handleFunClick(obj) {
console.log("obj", obj);
@ -886,15 +809,9 @@ export default {
});
} else if (obj.value === 4) {
// ETC
// uni.navigateToMiniProgram({
// appId: "wxb228568a0a4f7120",
// });
this.$refs.ETCRef.open("center");
// uni.navigateTo({
// url: `/pages/etcMap/index`,
// });
uni.navigateToMiniProgram({
appId: "wxb228568a0a4f7120",
});
} else if (obj.value === 5) {
// 点餐
uni.navigateTo({
@ -966,14 +883,8 @@ export default {
},
});
} else if (obj.value === 15) {
if (this.isChangeIcon) {
uni.navigateTo({
url: `/pages/shopMallPage/shopType/index`,
});
} else {
// 商城
this.handleGoShop();
}
// 商城
this.handleGoShop();
}
},
// 跳转到商城
@ -993,8 +904,6 @@ export default {
uni.navigateTo({ url: "/pages/newMap/index/index?comeForm=home" });
},
getLocalServer() {
console.log("getLocation");
// 根据定位获取周边服务区
let _this = this;
uni.getLocation({
@ -1016,9 +925,6 @@ export default {
console.log("2");
_this.handleGetNearService(latitude, longitude);
},
fail: (err) => {
console.log("err", err);
},
});
},
// 合并服务区数据
@ -1189,9 +1095,6 @@ export default {
} else {
this.roadStatusList = [];
}
this.roadStatusList.unshift({
NOTICEINFO_TITLE: "最新放假通知：调休2天，免费8天！",
});
},
// 跳转高速头条
handleGoHighWay() {
@ -2034,54 +1937,6 @@ export default {
color: transparent;
}
.noticePopup {
width: 70vw;
height: calc(2688 * 70vw / 1242);
background: #fff;
border-radius: 32rpx;
background-image: url(https://eshangtech.com/minTestImg/preSalePoster.jpg);
background-repeat: no-repeat;
background-size: 100% 100%;
box-sizing: border-box;
padding: 300rpx 120rpx 160rpx;
}
.ETCPopup {
width: 80vw;
height: 120px;
background: #fff;
border-radius: 32rpx;
box-sizing: border-box;
padding: 32rpx;
display: flex;
align-items: center;
justify-content: space-between;
.ETCItem {
width: calc(50% - 32rpx);
// background: #e7f8ee;
// padding: 16rpx;
// border-radius: 8rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
// box-sizing: border-box;
.itemImg {
width: 80rpx;
height: 80rpx;
margin-bottom: 24rpx;
}
.itemText {
font-family: "PingFangSC";
font-weight: 400;
font-size: 24rpx;
line-height: 32rpx;
text-align: justify;
font-style: normal;
white-space: nowrap;
}
}
}
.backTopBox {
width: 40px;
height: 40px;

1
pages/myAddress/address/index.vue
View File

@ -117,7 +117,6 @@ export default {
this.addressId = Number(option.id);
this.pageMsg.type = option.type;
}
this.$utils.addUserBehaviorNew();
// this.getList()
// this.handleGetWxAddress();
},

271
pages/myAddress/newAdd/index.vue
View File

@ -48,39 +48,14 @@
</div>
<view class="adress-content borbottom">
<text class="content-title">收货地址</text>
<view
class="content-input address-content"
style="text-align: left"
@click="handleShowPopup"
>
{{ saveMsg.address || "请选择收货地址" }}
<view class="content-input address-content" @click="handleShowPopup">
{{ saveMsg.address }}
<image
src="https://cdn-icons-png.flaticon.com/512/545/545682.png"
style="width: 28rpx; height: 28rpx; margin-left: 12rpx"
/>
</view>
</view>
<div
class="textarea-content borbottom"
v-if="streetList && streetList.length > 0"
>
<span class="content-title">街道地址</span>
<div class="content-input">
<picker
mode="selector"
:range="streetList"
range-key="region_name"
:value="streetIndex"
@change="handleChangeStreet"
>
{{
streetList[streetIndex] && streetList[streetIndex].region_name
? streetList[streetIndex].region_name
: "请选择街道"
}}
</picker>
</div>
</div>
<div class="textarea-content borbottom">
<span class="content-title">详细地址</span>
@ -151,7 +126,7 @@
>
<picker-view-column>
<view class="item" v-for="(item, index) in areaData" :key="index">{{
item.region_name
item.name
}}</view>
</picker-view-column>
<picker-view-column>
@ -159,7 +134,7 @@
class="item"
v-for="(item, index) in city_list"
:key="index"
>{{ item.region_name }}</view
>{{ item.name }}</view
>
</picker-view-column>
<picker-view-column>
@ -167,7 +142,7 @@
class="item"
v-for="(item, index) in county_list"
:key="index"
>{{ item.region_name }}</view
>{{ item.name }}</view
>
</picker-view-column>
</picker-view>
@ -185,11 +160,11 @@
<script>
import { mapGetters } from "vuex";
// import newArea from "../../../common/newArea.js";
import newArea from "../../../common/newArea.js";
export default {
data() {
// let areaData = newArea;
let areaData = newArea;
return {
sexList: [
{
@ -229,8 +204,7 @@ export default {
isDefault: false,
tagType: "",
},
areaData: [],
// areaData: areaData,
areaData: areaData,
pageMsg: {
id: "",
address: {},
@ -240,85 +214,21 @@ export default {
city_list: [],
county_list: [],
addressSelectIndex: [0, 0, 0],
streetList: [],
streetIndex: 0,
};
},
computed: {
...mapGetters(["user"]),
},
methods: {
// 拿到省份数据 默认数据
async handleGetProviceCode() {
let req = {
level: 1,
page: 1,
pageSize: 999,
};
const data = await this.$api.$postNode("/pino/region/list", req);
let list = data.data.data.result;
console.log("datadsdsa", list);
this.areaData = list;
let cityReq = {
parentId: list[0].region_id,
page: 1,
pageSize: 999,
};
const cityData = await this.$api.$postNode("/pino/region/list", cityReq);
console.log("cityData", cityData);
let citylist = cityData.data.data;
this.city_list = citylist;
let countyReq = {
parentId: citylist[0].region_id,
page: 1,
pageSize: 999,
};
const countyData = await this.$api.$postNode(
"/pino/region/list",
countyReq
);
console.log("countyData", countyData);
let countylist = countyData.data.data;
this.county_list = countylist;
console.log("countylist", countylist);
},
async areaChange(e) {
areaChange(e) {
console.log("e", e);
let cityIndex = e.detail.value[0];
let cityReq = {
parentId: this.areaData[cityIndex].region_id,
page: 1,
pageSize: 999,
};
const cityData = await this.$api.$postNode("/pino/region/list", cityReq);
let citylist = cityData.data.data;
this.city_list = citylist;
let countyReq = {
parentId: citylist[e.detail.value[1]].region_id,
page: 1,
pageSize: 999,
};
const countyData = await this.$api.$postNode(
"/pino/region/list",
countyReq
);
console.log("countyData", countyData);
let countylist = countyData.data.data;
this.county_list = countylist;
// let countyIndex = e.detail.value[1];
// this.county_list = this.city_list[countyIndex].children;
let countyIndex = e.detail.value[1];
this.city_list = this.areaData[cityIndex].children;
this.county_list = this.city_list[countyIndex].children;
this.addressSelectIndex = e.detail.value;
this.$forceUpdate();
},
// 切换街道
handleChangeStreet(e) {
console.log("e", e);
this.streetIndex = Number(e.target.value);
},
handleShowPopup() {
this.$refs.popup.open("bottom");
console.log("areaData", this.areaData);
@ -341,37 +251,21 @@ export default {
this.saveMsg.isDefault = e.detail.value;
this.$forceUpdate();
},
async handleGetStreetData() {
let streetReq = {
parentId: this.county_list[this.addressSelectIndex[2]].region_id,
page: 1,
pageSize: 999,
};
const streetData = await this.$api.$postNode(
"/pino/region/list",
streetReq
);
console.log("streetData", streetData);
let streetList = streetData.data.data;
this.streetList = streetList;
},
getAddress(obj) {
console.log("this.addressSelectIndex", this.addressSelectIndex);
this.handleClosePopup();
let content = this.addressSelectIndex;
this.saveMsg.address =
this.areaData[content[0]].region_name +
this.city_list[content[1]].region_name +
this.county_list[content[2]].region_name;
this.areaData[content[0]].name +
this.city_list[content[1]].name +
this.county_list[content[2]].name;
this.pageMsg.address = content;
console.log("this.saveMsg", this.saveMsg);
this.handleGetStreetData();
},
checkFn() {
let _this = this;
let flag = 0;
console.log("_this.saveMsg", this.saveMsg);
for (let element in this.saveMsg) {
if (_this.saveMsg[element] === "") {
@ -408,16 +302,6 @@ export default {
});
return false;
}
if (this.streetList && this.streetList.length > 0) {
if (this.streetIndex >= 0) {
} else {
uni.showToast({
title: "请选择街道地址！",
icon: "none",
});
return false;
}
}
if (flag === 0) {
this.saveFn();
}
@ -433,20 +317,7 @@ export default {
}
arr.requestType = "application/x-www-form-urlencoded";
arr.isDefault = Number(arr.isDefault);
let [provinceIndex, cityIndex, countryIndex] = this.addressSelectIndex;
arr.addressCode = [
this.areaData[provinceIndex].region_id,
this.city_list[cityIndex].region_id,
this.county_list[countryIndex].region_id,
this.streetList && this.streetList.length > 0
? this.streetList[this.streetIndex].region_id
: "",
];
console.log("arr", arr);
this.$api.postCoop(arr).then(function (res) {
if (res.ResultCode === "100") {
uni.showToast({
@ -461,96 +332,6 @@ export default {
}
});
},
// 编辑进入的时候 默认把选择栏的数据变为 他记录里面的
async defaultAddressSelect(obj) {
console.log("defaultAddressSelect", obj);
console.log("areaData", this.areaData);
let [areaId, cityId, countyId, streetId] =
obj.MEMBERADDRESS_CODE.split(",");
let areaIndex = 0;
let cityIndex = 0;
let countyIndex = 0;
let streetIndex = 0;
let req = {
level: 1,
page: 1,
pageSize: 999,
};
const data = await this.$api.$postNode("/pino/region/list", req);
let list = data.data.data.result;
console.log("datadsdsa", list);
this.areaData = list;
if (this.areaData && this.areaData.length > 0) {
this.areaData.forEach((item, index) => {
if (item.region_id === areaId) {
areaIndex = index;
}
});
}
let cityReq = {
parentId: this.areaData[areaIndex].region_id,
page: 1,
pageSize: 999,
};
const cityData = await this.$api.$postNode("/pino/region/list", cityReq);
console.log("cityData", cityData);
let citylist = cityData.data.data;
this.city_list = citylist;
if (this.city_list && this.city_list.length > 0) {
this.city_list.forEach((item, index) => {
if (item.region_id === cityId) {
cityIndex = index;
}
});
}
let countyReq = {
parentId: citylist[cityIndex].region_id,
page: 1,
pageSize: 999,
};
const countyData = await this.$api.$postNode(
"/pino/region/list",
countyReq
);
console.log("countyData", countyData);
let countylist = countyData.data.data;
this.county_list = countylist;
if (this.county_list && this.county_list.length > 0) {
this.county_list.forEach((item, index) => {
if (item.region_id === countyId) {
countyIndex = index;
}
});
}
let streetReq = {
parentId: this.county_list[countyIndex].region_id,
page: 1,
pageSize: 999,
};
const streetData = await this.$api.$postNode(
"/pino/region/list",
streetReq
);
console.log("streetData", streetData);
let streetList = streetData.data.data;
if (streetList && streetList.length > 0) {
streetList.forEach((item, index) => {
if (item.region_id === streetId) {
streetIndex = index;
}
});
}
this.streetList = streetList;
this.addressSelectIndex = [areaIndex, cityIndex, countyIndex];
this.streetIndex = streetIndex;
},
getMsg() {
let _this = this;
let arr = {
@ -561,8 +342,6 @@ export default {
this.$api.postCoop(arr).then(function (res) {
if (res.ResultCode === "100") {
let data = res.Data;
console.log("res.Data", res.Data);
if (data.USER_SEX === 1) {
_this.sexList[0].isChecked = true;
} else if (data.USER_SEX === 2) {
@ -573,8 +352,8 @@ export default {
userName: data.USER_NAME,
userSex: data.USER_SEX,
mobilePhone: data.MOBILEPHONE,
address: data.MEMBERADDRESS_CODE ? data.ADDRESS : "",
doorplate: data.MEMBERADDRESS_CODE ? data.DOORPLATE : "",
address: data.ADDRESS,
doorplate: data.DOORPLATE,
isDefault: Boolean(data.ISDEFAULT),
tagType: data.TAGTYPE,
};
@ -583,8 +362,6 @@ export default {
n.isChecked = true;
}
});
_this.defaultAddressSelect(data);
// _this.$forceUpdate()
}
});
@ -734,16 +511,13 @@ export default {
},
onLoad(option) {
this.pageMsg.id = option.id || "";
// this.city_list = this.areaData[0].children;
// this.county_list = this.city_list[0].children;
// console.log("this.city_list", this.city_list);
// console.log("this.county_list", this.county_list);
this.city_list = this.areaData[0].children;
this.county_list = this.city_list[0].children;
console.log("this.city_list", this.city_list);
console.log("this.county_list", this.county_list);
if (option.id) {
this.getMsg();
} else {
// 拿到省份数据
this.handleGetProviceCode();
if (option.type === "getWx") {
// 导入微信的地址
this.handleGetWxAddress();
@ -752,7 +526,6 @@ export default {
this.loadIndustry();
}
}
this.$utils.addUserBehaviorNew();
},
};
</script>
@ -854,7 +627,7 @@ textarea {
.address-content {
display: flex;
align-items: center;
justify-content: space-between;
justify-content: flex-end;
}
.tip-content {

1
pages/newEvaluate/index.vue
View File

@ -428,7 +428,6 @@ export default {
this.saveMsg.salebillId = option.orderInternal;
this.saveMsg.action_type = "addMallComment";
}
this.$utils.addUserBehaviorNew();
},
};
</script>

1
pages/newMap/index/index.vue
View File

@ -230,7 +230,6 @@ export default {
});
}
}
this.$utils.addUserBehaviorNew();
},
onHide() {
this.isShowMap = true;

8
pages/order/buyOrder/index.vue
View File

@ -139,8 +139,6 @@ export default {
: "";
// 获取订单数据
this.handleGetOrderList(type);
this.$utils.addUserBehaviorNew();
},
methods: {
// 滚动到底部 加载更多
@ -237,12 +235,10 @@ export default {
action_type: "GetMallOrderList",
salebillType:
this.searchType === "6"
? this.pageType === "UnionMall"
? 3001
: 3999
? 3999
: this.pageType === "UnionMall"
? 3001
: "3000,3002",
: 3000,
salebillState: this.searchType === "6" ? "" : status || "",
PageIndex: this.pageMsg.pageIndex,
pageSize: this.pageMsg.pageSize,

1
pages/order/foodOrder/index.vue
View File

@ -135,7 +135,6 @@ export default {
: "";
// 获取订单数据
this.handleGetOrderList(type);
this.$utils.addUserBehaviorNew();
},
methods: {
// 滚动到底部 加载更多

3
pages/order/orderFoodDetail/index.vue
View File

@ -360,7 +360,7 @@ export default {
let req = {
appid: "wxee018fb96955552a", // 公众账号ID
mchid: "1672298991", // 商户号
description: "彩云驿出行", //商品描述
description: "彩云驿商城", //商品描述
out_trade_no: out_trade_no, // 商户订单号
notify_url:
"https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
@ -786,7 +786,6 @@ export default {
this.orderNumber = option.orderNumber;
this.orderInternal = option.orderInternal;
this.getOrderType();
this.$utils.addUserBehaviorNew();
},
};
</script>

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

@ -29,10 +29,7 @@
<div class="status-btn-box">
<block v-if="orderInfo.SALEBILL_STATE === 1005">
<div class="back-btn" @click="orderCancle">取消订单</div>
<div
class="continu-btn"
@click="goPayment(orderInfo, orderInfo.TOTAL_PAY)"
>
<div class="continu-btn" @click="goPayment(orderInfo)">
去付款 <span>{{ minutes }}</span>
</div>
</block>
@ -72,11 +69,7 @@
</div>
</div>
<!-- <text @click="handleChangeOrderStatus">收货</text> -->
<div class="hx-block"></div>
<div class="pageDesc">*自提商品的提货地址：凌云大厦一楼彩云驿购</div>
<div class="order-info">
<p class="order-info-type order-info-h">
<!-- :class="{ appoint: orderInfo.TAKE_TYPE === 2000 }" -->
@ -97,14 +90,6 @@
: ""
}}</span>
</p>
<p
class="order-info-type"
v-if="orderInfo.TAKE_TYPE === 2000 && orderInfo.SALEBILL_STATE >= 2010"
>
<span class="order-info-t">快递单号</span
><span>{{ orderInfo.TABLE_NUMBER || "" }}</span>
</p>
<p class="order-info-type">
<span class="order-info-t">订单编号</span
><span>{{ orderInfo.SALEBILL_CODE }}</span>
@ -119,7 +104,7 @@
<span class="order-info-t">下单人员</span
><span>{{ orderInfo.ORDER_PERSON }}</span>
</p>
<p class="order-info-type" v-if="orderInfo.RESERVATION_DATE">
<p class="order-info-type">
<span class="order-info-t">预约时间</span
><span>{{ orderInfo.RESERVATION_DATE }}</span>
</p>
@ -127,15 +112,6 @@
<span class="order-info-t">预约电话</span
><span>{{ orderInfo.ORDER_PERSONTEL }}</span>
</p>
<p class="order-info-type" v-if="orderInfo.BALANCE_PAYMENT">
<span class="order-info-t">工会积分支付</span
><span>￥{{ orderInfo.BALANCE_PAYMENT }}</span>
</p>
<p class="order-info-type" v-if="orderInfo.TOTAL_PAY">
<span class="order-info-t">微信支付</span
><span>￥{{ orderInfo.TOTAL_PAY }}</span>
</p>
</block>
</div>
@ -285,7 +261,6 @@ export default {
type: 0,
},
sellchildid: "", // 子ID
showNotice: false,
};
},
computed: {
@ -302,21 +277,6 @@ export default {
// 发起退款
handleRefund() {
let _this = this;
uni.showModal({
title: "提示",
content: "仅支持整单退款，确认发起退款申请？",
success: async function (res) {
if (res.confirm) {
uni.navigateTo({
url: `/pages/order/orderdetail/reasonforRefund?salebillId=${_this.orderInfo.SALEBILL_ID}&&saleBillChildId=${_this.orderInfo.SALEBILL_CHILD_ID}`,
});
}
},
});
// 现在跳个页面 发起退款 所以下面的操作 就在其他页面完成
return;
// let _this = this;
let openId = uni.getStorageSync("openId");
console.log("openId", openId);
@ -335,7 +295,6 @@ export default {
wechatOpenId: openId || "",
oriSalebillCode: _this.orderInfo.SALEBILL_CODE,
wechatUnionId: _this.user.USER_UNIONID || "",
takeType: _this.orderInfo.TAKE_TYPE,
// addressId: this.addressInfo.MEMBERADDRESS_ID,
// orderPersonTel: this.addressInfo.MOBILEPHONE,
// couponCode: '',//优惠券
@ -405,7 +364,7 @@ export default {
this.getOrderInfo();
}
},
async goPayment(obj, payMoney) {
async goPayment(obj) {
console.log("tatalMoney", this.tatalMoney);
// this.$refs.payPopup.open("bottom");
// 判断用户是否可余额支付
@ -430,14 +389,12 @@ export default {
let req = {
appid: "wxee018fb96955552a", // 公众账号ID
mchid: "1672298991", // 商户号
description: "彩云驿出行", //商品描述
description: "彩云驿商城", //商品描述
out_trade_no: out_trade_no, // 商户订单号
notify_url:
"https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
amount: {
total: payMoney
? payMoney * 100
: Number(_this.tatalMoney) * 100 || 1,
total: Number(_this.tatalMoney) * 100 || 1,
currency: "CNY",
}, // 订单金额
payer: {
@ -504,9 +461,7 @@ export default {
package: `prepay_id=${res.data.prepay_id}`,
signType: "RSA",
paySign: paySign,
total_fee: payMoney
? payMoney * 100
: Number(_this.tatalMoney) * 100 || 1,
total_fee: Number(_this.tatalMoney) * 100 || 1,
success(res) {
console.log("res", res);
},
@ -638,7 +593,6 @@ export default {
action_data: _this.orderInfo.SALEBILL_ID,
saleBillChildId: _this.sellchildid > 0 ? _this.sellchildid : "",
SALEBILL_STATE: 9999,
mixPay: 1,
// deliverDate: new Date()
};
const data = await _this.$api.getCoop(req);
@ -648,58 +602,11 @@ export default {
title: data.msg,
icon: "none",
});
if (data.error === 1) {
if (_this.orderInfo.SALEBILL_TYPE === 3002) {
// 反查品诺的订单号
// 品诺的订单号详情
const pingnuoOrderDetail = await _this.$api.$postNode(
"/pino/order/query-by-third",
{ orderSn: _this.orderInfo.SALEBILL_CODE, orderSnType: 2 }
);
if (pingnuoOrderDetail.code === 200) {
let pingnuoOrderId =
pingnuoOrderDetail.data.data[0].parent_order_sn;
const pingnuoData = await _this.$api.$postNode(
"/pino/order/cancel-order",
{ orderSn: pingnuoOrderId }
);
if (pingnuoData.code === 200) {
uni.showToast({
title: "取消订单成功",
icon: "none",
duration: 2000,
success: function () {},
});
uni.navigateBack({ delta: 1 });
} else {
uni.showModal({
title: "提示",
content: `${pingnuoData.data.description}`,
success: function (res) {},
});
}
} else {
uni.showModal({
title: "提示",
content: `${pingnuoOrderDetail.data.description}`,
success: function (res) {},
});
}
} else {
uni.showToast({
title: "取消订单成功",
icon: "none",
duration: 2000,
success: function () {},
});
uni.navigateBack({ delta: 1 });
}
// uni.redirectTo({
// url: "/pages/order/buyOrder/index",
// });
uni.navigateBack({ delta: 1 });
}
// _this.$api
// .postCoop({
@ -913,9 +820,9 @@ export default {
clearInterval(this.timer);
this.pageMsg.type = 0;
},
onShow() {
this.getOrderType();
},
// onShow () {
// this.getOrderType()
// },
onLoad(option) {
console.log("option", option);
@ -939,8 +846,7 @@ export default {
this.orderNumber = option.orderNumber;
this.orderInternal = option.orderInternal;
// this.getOrderType();
this.$utils.addUserBehaviorNew();
this.getOrderType();
},
};
</script>
@ -1042,15 +948,6 @@ page {
box-sizing: border-box;
// box-shadow 0 2rpx 16rpx 0.4rpx #e2e2e2
}
.pageDesc {
width: 100%;
text-align: left;
font-size: 28rpx;
color: red;
box-sizing: border-box;
padding-left: 32rpx;
margin-bottom: 16rpx;
}
.order-top {
display: flex;

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

@ -1,319 +0,0 @@
<template>
<view class="container">
<view class="title">请选择退款原因</view>
<scroll-view class="scrollView" scroll-y>
<radio-group class="radio-group" @change="onReasonChange">
<label
class="radio-item"
v-for="(item, index) in reasons"
:key="index"
:style="{
alignItems: index + 1 === reasons.length ? 'flex-start' : '',
}"
>
<radio :value="item.value" :checked="item.checked" />
<text>{{ item.label }}</text>
<!-- <textarea
v-if="item.value === 'other'"
v-model="otherReason"
class="other-input"
placeholder="请输入具体原因"
:disabled="selectedReason !== 'other'"
/> -->
</label>
</radio-group>
<radio-group
v-if="childrenReasons && childrenReasons.length > 0"
class="radio-group"
style="margin-top: 40rpx"
@change="onChildrenReasonChange"
>
<label
class="radio-item"
v-for="(item, index) in childrenReasons"
:key="index"
:style="{
alignItems:
item.value === 2099 || item.value === 1099 ? 'flex-start' : '',
}"
>
<radio :value="item.value" :checked="item.checked" />
<text>{{ item.label }}</text>
<textarea
v-if="item.value === 2099 || item.value === 1099"
v-model="otherReason"
class="other-input"
placeholder="请输入具体原因"
:disabled="selectedChildrenReason !== selectedChildrenReason"
/>
</label>
</radio-group>
</scroll-view>
<view class="submit-btn" @click="onSubmit"> 确认退款 </view>
</view>
</template>
<script>
import { mapGetters } from "vuex";
export default {
data() {
return {
selectedReason: "",
selectedReasonText: "", // 选择的父集名称
otherReason: "",
reasons: [],
orderInfo: {}, // 订单详情先拿到
orderInternal: "", // 退款的id
sellchildid: "", // 退款的id
childrenReasons: [], // 子集原因列表
selectedChildrenReason: "", // 选择的子集
selectedChildrenText: "", // 选择的子集名称
};
},
computed: {
...mapGetters(["user"]),
},
onLoad(query) {
// 拿到要退款的订单id
if (query.salebillId) {
this.orderInternal = query.salebillId;
}
if (query.saleBillChildId) {
this.sellchildid = query.saleBillChildId;
}
// 退货的枚举类型
this.handleServiceType();
// 订单的详情
this.getOrderType();
this.$utils.addUserBehaviorNew();
},
methods: {
// 退货的枚举类型
async handleServiceType() {
uni.showLoading({
title: "加载中...",
});
const data = await this.$api.$get(
"/EShangApiMain/FrameWork/GetFieldEnumTree",
{ FieldExplainField: "AFTERSALE_TYPE" }
);
let list = this.$utils.wrapTreeNode(data.Result_Data.List);
this.reasons = list;
uni.hideLoading();
},
// 获取订单状态
getOrderType() {
let _this = this;
_this.$api
.getCoop({
action_type: "GetOrderDetail",
salebillId: _this.orderInternal,
saleBillChildId: _this.sellchildid ? _this.sellchildid : "",
})
.then((res) => {
if (res.ResultCode === "100") {
let _data = res.Data;
_this.orderInfo = _data;
}
});
},
onChildrenReasonChange(e) {
this.selectedChildrenReason = Number(e.detail.value);
let list = this.childrenReasons.filter(
(item) => item.value === Number(e.detail.value)
);
this.selectedChildrenText = list[0].label;
if (
this.selectedChildrenReason !== "2099" &&
this.selectedChildrenReason !== "1099"
) {
this.otherReason = "";
}
},
onReasonChange(e) {
this.selectedReason = e.detail.value;
let list = this.reasons.filter(
(item) => item.value === Number(e.detail.value)
);
let childrenList = [];
if (list && list.length > 0) {
childrenList = list[0].children;
this.selectedReasonText = list[0].label;
}
this.childrenReasons = childrenList;
this.$forceUpdate();
// if (this.selectedReason !== "other") {
// this.otherReason = "";
// }
},
async onSubmit() {
if (!this.selectedReason) {
uni.showToast({
title: "请选择退款原因",
icon: "none",
});
return;
}
if (!this.selectedChildrenReason) {
uni.showToast({
title: "请选择具体原因",
icon: "none",
});
return;
}
if (
(this.selectedChildrenReason === 2099 ||
this.selectedChildrenReason === 1099) &&
!this.otherReason
) {
uni.showToast({
title: "请输入具体原因",
icon: "none",
});
return;
}
let _this = this;
let openId = uni.getStorageSync("openId");
let reqOrder = {
action_type: "ScanOrder",
salebillType: 3999,
provinceCode: _this.user.PROVINCE_CODE || "530000",
serverpartShopId: "5634",
salebillDesc: `${this.selectedReasonText}:${
this.selectedChildrenText === "其他原因"
? this.otherReason
: this.selectedChildrenText
}`,
wechatOpenId: openId || "",
oriSalebillCode: _this.orderInfo.SALEBILL_CODE,
wechatUnionId: _this.user.USER_UNIONID || "",
takeType: _this.orderInfo.TAKE_TYPE,
t_saleorderdetail: JSON.stringify(_this.orderInfo.List),
requestType: "application/x-www-form-urlencoded",
};
const orderData = await _this.$api.postCoop(reqOrder);
if (orderData.ResultCode === "100") {
const req = {
action_type: "UpdateOrderState",
action_data: _this.orderInfo.SALEBILL_ID,
SALEBILL_STATE: 8000,
};
const data = await _this.$api.getCoop(req);
// 提交退款申请逻辑
uni.showToast({
title: "退款申请已提交",
icon: "success",
});
setTimeout(() => {
uni.navigateBack({
delta: 1,
});
}, 1000);
// if (data.error === 1) {
// _this.getOrderType();
// }
} else {
uni.showToast({
title: orderData.ResultDesc,
icon: "none",
});
}
},
},
};
</script>
<style lang="less" scoped>
.container {
padding: 32rpx;
background: #fff;
}
.title {
font-size: 16px;
font-weight: bold;
margin-bottom: 20px;
}
.scrollView {
width: 100%;
height: calc(100vh - 84px - 37px - 46px);
padding: 16px 0;
}
.scrollView ::-webkit-scrollbar {
display: none;
width: 0;
}
.radio-group {
// margin-bottom: 30px;
// height: 100%;
padding: 12rpx;
border-radius: 8rpx;
background: #f6f6f6;
box-sizing: border-box;
padding-left: 24rpx;
}
.radio-item {
display: flex;
align-items: center;
padding: 15px 0;
border-bottom: 1px solid #eee;
&:last-child {
border-bottom: none;
}
text {
margin-left: 10px;
font-size: 14px;
}
.other-input {
flex: 1;
margin-left: 10px;
padding: 5px;
border: 1px solid #ddd;
border-radius: 4px;
font-size: 14px;
&:disabled {
background-color: #f5f5f5;
border-color: #eee;
}
}
}
.submit-btn {
width: 90vw;
padding: 22rpx 0;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: center;
font-family: "PingFangSC";
font-weight: 400;
font-size: 32rpx;
color: #ffffff;
line-height: 44rpx;
text-align: right;
font-style: normal;
background: #1e9b4a;
border-radius: 8rpx;
position: fixed;
bottom: 40px;
left: 5vw;
}
</style>

1
pages/payfor/index.vue
View File

@ -451,7 +451,6 @@ export default {
}
this.getCouponLsit();
this.getCode();
this.$utils.addUserBehaviorNew();
},
onHide() {
clearInterval(this.timer);

10
pages/register/index.vue
View File

@ -6,14 +6,14 @@
<view class="contentText">
为了更好的维护您的权益，我们对
<text class="tips" @click="handleOpenPrivacyContract"
>《彩云驿出行隐私保护指引》</text
>《彩云驿商城隐私保护指引》</text
>进行了更新，特向您推送本更新提示，请仔细阅读并充分理解相关条款。
</view>
<view class="contentText">
您点击“立即授权”，即代表您已经阅读并同意更新后的<text
class="tips"
@click="handleOpenPrivacyContract"
>《彩云驿出行隐私保护指引》</text
>《彩云驿商城隐私保护指引》</text
>条款。
</view>
<view class="imgbox">
@ -166,7 +166,6 @@ export default {
}
},
});
this.$utils.addUserBehaviorNew();
},
methods: {
...mapMutations({
@ -235,11 +234,6 @@ export default {
_this.setCanIUse(false);
// _this.payForVip(true)
// uni.switchTab({ url: "/pages/index/index" });
const app = getApp();
if (app.globalData.recommendId && app.globalData.recommendCode) {
_this.$utils.addUserBehaviorNew(null, true);
}
uni.navigateBack({
delta: 1,
});

1
pages/reservationOrder/index.vue
View File

@ -175,7 +175,6 @@ export default {
// 获取这个服务区的门店列表 且自己筛选 只留下 可以点餐的门店
await this.handleGetServerpartDetail(this.thisServerpartId);
await this.handleGetShopList();
this.$utils.addUserBehaviorNew();
},
onShow() {
let currentService = uni.getStorageSync("currentService");

1
pages/serviceDetail/index.vue
View File

@ -837,7 +837,6 @@ export default {
await this.handleGetServerpartDetail(this.serverpart);
await this.handleGetMerchant();
await this.handleGetChargingStation(this.detailInfo);
this.$utils.addUserBehaviorNew();
},
async onShow() {
let currentService = uni.getStorageSync("currentService");

1
pages/serviceList/index.vue
View File

@ -169,7 +169,6 @@ export default {
});
this.pageType = query.type;
this.handleGetServiceList();
this.$utils.addUserBehaviorNew();
},
computed: {
...mapGetters({

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

@ -39,7 +39,7 @@
@click="handleBackHome"
/>
<view class="pageName">{{
pageType === "UnionMall" ? "工会之家" : "彩云驿商城"
pageType === "UnionMall" ? "工会商城" : "彩云驿购"
}}</view>
<view class="backArrow"></view>
</view>
@ -55,32 +55,19 @@
height:
shopTypeList.length < 5
? '144rpx'
: shopTypeList.length === 5
? Math.ceil(6 / 5) * 144 +
(Math.ceil(6 / 5) - 1) * 42 +
60 +
'rpx'
: Math.ceil(shopTypeList.length / 5) * 144 +
(Math.ceil(shopTypeList.length / 5) - 1) * 42 +
60 +
'rpx',
}"
>
<!-- height:
shopTypeList.length < 5
? '144rpx'
: Math.ceil(shopTypeList.length / 5) * 144 +
(Math.ceil(shopTypeList.length / 5) - 1) * 42 +
60 +
'rpx', -->
<!-- :style="{
width:
shopTypeList.length <= 5
? '100%'
: shopTypeList.length * 136 + 60 + 'rpx',
}" -->
<!-- 工会之家 -->
<!-- 工会商城 -->
<div
class="rowBox"
@click="handleGoUnionMall"
@ -94,7 +81,7 @@
></image>
</div>
</div>
<div class="itemName">工会之家</div>
<div class="itemName">工会商城</div>
</div>
<div
@ -109,7 +96,6 @@
index < Math.ceil(shopTypeList.length / 4 - 1) * 4
? '44rpx'
: '',
marginTop: pageType !== 'UnionMall' && index >= 4 ? '44rpx' : '',
}"
>
<div class="imgBox">
@ -126,23 +112,6 @@
<div class="itemName">{{ item.UserdefinedType_Name }}</div>
</div>
<!-- 积分商城 -->
<div
class="rowBox"
@click="handleGoPointsMall"
v-if="pageType !== 'UnionMall'"
>
<div class="imgBox">
<div class="itemImgBox">
<image
class="img"
src="/static/images/home/markShopIcon.png"
></image>
</div>
</div>
<div class="itemName">积分商城</div>
</div>
<!-- <div
class="rowBox"
:style="{
@ -176,7 +145,7 @@
<div class="pageContent">
<!-- 公告 -->
<div class="noticeBox" @click="handleGoNotice" v-if="false">
<div class="noticeBox" @click="handleGoNotice">
<div class="noticeLeft">
<image class="noticeIcon" src="/static/images/home/noticeIcon.png" />
<text class="noticeTitle">公告</text>
@ -190,77 +159,6 @@
</div>
</div>
<!-- 活动 -->
<div
class="advertisement"
v-if="haveActivity"
:style="{
background: pageType !== 'UnionMall' ? '#fff' : 'transparent',
}"
>
<div
class="advertisementContentBox"
v-if="pageType !== 'UnionMall'"
@click="handleGoActivityType"
>
<div class="advertisementTop">
<div class="title">
{{ activityObj.UserdefinedType_Name || "" }}
<!-- <image
class="titleImg"
src="https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/title1st.png"
/> -->
</div>
<!-- <div class="moreBox">
<text class="moreText">低价爆品天天有</text>
<image
class="rightIcon"
src="https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/rightArrow.png"
/>
</div> -->
</div>
<scroll-view
class="shopList"
scroll-x
v-if="activityShopList && activityShopList.length > 0"
>
<!-- @click="handleGoShop(item)"-->
<div
:style="{
width: activityShopList.length * 160 + 'rpx',
height: '100%',
whiteSpace: 'noWrap',
}"
>
<div
class="shopItem"
v-for="(item, index) in activityShopList"
:key="index"
@click.stop="handleGoShopDetail(item)"
>
<div class="shopItemImg">
<div class="imgBox">
<image
class="shopImg"
:src="
item.IMAGE_PATH || '/static/images/home/defultImg.png'
"
/>
</div>
<text class="discountedPrice"
>¥{{ item.bigNumber || "" }}.{{
item.smallNumber || "00"
}}</text
>
</div>
<!-- <text class="price">¥15.99</text>-->
</div>
</div>
</scroll-view>
</div>
</div>
<!-- 特价优惠 -->
<div
class="advertisement"
@ -325,7 +223,7 @@
</scroll-view>
</div>
<!-- 工会之家的时候 显示排行榜 -->
<!-- 工会商城的时候 显示排行榜 -->
<div class="sortBox" v-if="pageType === 'UnionMall'">
<div class="leftSortBox" @click="handleGoSortList(1)">
@ -334,7 +232,7 @@
<text class="title"><text style="color: red">新</text>品榜</text>
</div>
<div class="notice">超多优惠等你来</div>
<view class="shopList">
<div class="shopList">
<view
class="shopItem"
v-for="(item, index) in newShopList"
@ -347,7 +245,7 @@
@click.stop="handleGoShopDetail(item)"
/>
</view>
</view>
</div>
</div>
<div
@ -361,18 +259,16 @@
>
</div>
<div class="notice">本地特色</div>
<view class="shopList">
<view
class="shopItem"
v-for="(item, index) in hotShopList"
:key="index"
>
<image
class="shopImg"
:src="item.IMAGE_PATH"
@click.stop="handleGoShopDetail(item)"
/>
</view>
<view
class="shopItem"
v-for="(item, index) in hotShopList"
:key="index"
>
<image
class="shopImg"
:src="item.IMAGE_PATH"
@click.stop="handleGoShopDetail(item)"
/>
</view>
</div>
<div class="rightItem bg3" @click="handleGoSortList(3)">
@ -382,18 +278,16 @@
>
</div>
<div class="notice">本地特色</div>
<view class="shopList">
<view
class="shopItem"
v-for="(item, index) in goodShopList"
:key="index"
>
<image
class="shopImg"
:src="item.IMAGE_PATH"
@click.stop="handleGoShopDetail(item)"
/>
</view>
<view
class="shopItem"
v-for="(item, index) in goodShopList"
:key="index"
>
<image
class="shopImg"
:src="item.IMAGE_PATH"
@click.stop="handleGoShopDetail(item)"
/>
</view>
</div>
</div>
@ -721,7 +615,7 @@
</view>
</uni-popup>
<uni-popup ref="noticeRef" v-if="false">
<uni-popup ref="noticeRef">
<view class="noticePopup" @click="handleHidePopup">
<view class="popupContent">
<view class="title">尊敬的会员：</view>
@ -793,7 +687,7 @@ export default {
], // 热门品牌类型
minPrice: "", // 最低价
maxPrice: "", // 最高价
allShopList: [], // 工会之家时拿到的全部商品
allShopList: [], // 工会商城时拿到的全部商品
showShopList: [], // 当前显示的全部商品
pageIndex: 1, // 当前显示几个 10个商品
shopMsg: {
@ -818,9 +712,6 @@ export default {
showBackTop: false, // 页面滚动距离
scrollView: "",
safeHeight: 0, // ios的安全距离
haveActivity: false, // 是否有活动
activityObj: {}, // 活动项的具体内容
activityShopList: [], // 活动商品列表
};
},
async onLoad(query) {
@ -832,23 +723,13 @@ export default {
if (firstEntry === "2") {
} else {
this.isFirst = true;
// this.$refs.noticeRef.open("center");
this.$refs.noticeRef.open("center");
uni.setStorageSync("firstEntry", "2");
}
let safeHeight = uni.getStorageSync("safeHeight");
if (safeHeight) {
this.safeHeight = Number(safeHeight);
}
this.$utils.addUserBehaviorNew();
// if (query && query.recommendCode && query.recommendId) {
// this.$utils.addUserBehaviorNew(null,true);
// console.log("this.globalData", this.globalData);
// this.globalData.recommendCode = query.recommendCode;
// this.globalData.recommendId = query.recommendId;
// }
// this.globalData.recommendCode = 1111;
// this.globalData.recommendId = 2222;
if (query.pageType === "UnionMall") {
// 拿到顶部商品大类的方法
@ -869,53 +750,8 @@ export default {
}
let resList = obj.UserdefinedTypeList.slice(0, 8);
this.sortType = Math.floor(Math.random() * this.sortTypeList.length);
console.log("resList", resList);
// 2025-04-02 写死4个 类型
let newList = [
{
UserdefinedTypeList: [],
UserdefinedType_Desc: "",
UserdefinedType_ICO: "",
UserdefinedType_Id: 3176,
UserdefinedType_Index: 95,
UserdefinedType_Name: "节日慰问",
UserdefinedType_PId: "-1",
},
{
UserdefinedTypeList: [],
UserdefinedType_Desc: "",
UserdefinedType_ICO:
"https://user.eshangtech.com//UploadImageDir/PictureManage/11423/2025_01_12_23_28_36_3470.png",
UserdefinedType_Id: 1250,
UserdefinedType_Index: 60,
UserdefinedType_Name: "观影优惠",
UserdefinedType_PId: -1,
},
{
UserdefinedTypeList: [],
UserdefinedType_Desc: "",
UserdefinedType_ICO:
"https://user.eshangtech.com//UploadImageDir/PictureManage/11423/2025_01_12_23_28_19_4327.png",
UserdefinedType_Id: 1249,
UserdefinedType_Index: 58,
UserdefinedType_Name: "品质蛋糕",
UserdefinedType_PId: -1,
},
{
UserdefinedTypeList: [],
UserdefinedType_Desc: "",
UserdefinedType_ICO:
"https://user.eshangtech.com//UploadImageDir/PictureManage/11462/2025_01_12_22_58_33_6953.png",
UserdefinedType_Id: "工会活动",
UserdefinedType_Index: "",
UserdefinedType_Name: "工会活动",
UserdefinedType_PId: -1,
},
];
// this.shopTypeList = resList;
this.shopTypeList = newList;
this.shopTypeList = resList;
// 拿到榜单的方法
this.handleGetSortList();
// this.shopTypeList = [
@ -960,7 +796,7 @@ export default {
// UserdefinedType_ICO: "",
// },
// ];
// 拿到工会之家的商品列表
// 拿到工会商城的商品列表
this.handleGetUnionShopList();
} else {
// 拿到顶部商品大类的方法
@ -971,9 +807,6 @@ export default {
this.handleGetTodayOffers();
// 最下面的甄选商品
this.handleGetProductsList();
if (this.haveActivity) {
this.handleGetActivityList();
}
}
},
onShow() {
@ -1000,25 +833,18 @@ export default {
onShareAppMessage() {
let _this = this;
return {
// title: _this.pageType === "UnionMall" ? "工会之家" : "精选商城",
title:"彩云驿商城",
title: _this.pageType === "UnionMall" ? "工会商城" : "精选商城",
path: `/pages/index/index?pageType=${this.pageType}`,
};
},
onShareTimeline() {
let _this = this;
return {
// title: _this.pageType === "UnionMall" ? "工会之家" : "精选商城",
title:"彩云驿商城",
title: _this.pageType === "UnionMall" ? "工会商城" : "精选商城",
path: `/pages/index/index?pageType=${this.pageType}`,
};
},
methods: {
handleGoPointsMall() {
uni.navigateTo({
url: `/pages/shopPages/shopList/index?pageType=pointsMall`,
});
},
// 滚动到底部 加载更多的方法
handleScrollBottom() {
this.handleToBottom();
@ -1085,10 +911,8 @@ export default {
console.log("list2", list2);
console.log("list3", list3);
this.newShopList = list1.slice(0, 2);
this.hotShopList = list2.slice(0, 1);
this.goodShopList = list3.slice(0, 1);
console.log("this.hotShopList", this.hotShopList);
console.log("this.goodShopList", this.goodShopList);
this.hotShopList = [list2[0]];
this.goodShopList = [list3[0]];
},
handleChangeShopList(list) {
let shopList = [];
@ -1125,7 +949,7 @@ export default {
}
return shopList;
},
// 工会之家滚动到底部
// 工会商城滚动到底部
handleToBottom() {
this.shopMsg.pageIndex = this.shopMsg.pageIndex + 1;
if (this.shopMsg.isOver) {
@ -1142,7 +966,7 @@ export default {
this.handleGetProductsList();
}
},
// 拿到工会之家的商品列表
// 拿到工会商城的商品列表
async handleGetUnionShopList() {
uni.showLoading({
title: "加载中...",
@ -1224,7 +1048,7 @@ export default {
pageSize: 6,
isOver: false,
};
// 拿到工会之家的商品列表
// 拿到工会商城的商品列表
await this.handleGetUnionShopList();
this.$refs.priceRangeRef.close();
},
@ -1245,7 +1069,7 @@ export default {
pageSize: 6,
isOver: false,
};
// 拿到工会之家的商品列表
// 拿到工会商城的商品列表
await this.handleGetUnionShopList();
this.$refs.priceRangeRef.close();
},
@ -1276,33 +1100,18 @@ export default {
console.log("handleGetShopBigType", data);
let typeList = data.Data.List;
let resList = [];
// 如果有活动的话就有值
let activityObj = {};
// let indexOfList = [1248, 1247, 1257, 1245, 1246];
let indexOfList = [1248, 3175];
// , 1355
let indexOfList = [1248, 1247, 1257, 1245, 1246];
if (typeList && typeList.length > 0) {
typeList.forEach((item) => {
if (indexOfList.indexOf(item.UserdefinedType_Id) !== -1) {
resList.push(item);
}
if (item.UserdefinedType_Id === 1355) {
this.haveActivity = true;
activityObj = item;
}
});
}
if (this.haveActivity) {
// resList.push(activityObj);
this.activityObj = activityObj;
}
this.shopTypeList = resList;
this.selectProducts = resList[0].UserdefinedType_Id;
console.log("this.shopTypeList", this.shopTypeList);
console.log("this.activityObj", this.activityObj);
console.log("this.selectProducts", this.selectProducts);
// if (this.shopTypeList && this.shopTypeList.length < 10) {
// this.oneRowNumber = this.shopTypeList.length;
@ -1311,40 +1120,6 @@ export default {
// }
// console.log("this.oneRowNumber", this.oneRowNumber);
},
// 拿到活动的商品列表 可能不调用 有判断的
async handleGetActivityList() {
const data = await this.$api.getCoop({
action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911,
userdefinedtypeId: 1355,
excludeNature: 5070,
justCommodity: 1,
});
console.log("handleGetActivityList", data);
let list = data.Data.List;
let res = [];
if (list && list.length > 0) {
list.forEach((item) => {
if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
item.COMMODITYLIST.forEach((subItem) => {
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];
} else {
subItem.bigNumber = subItem.COMMODITY_MEMBERPRICE;
}
res.push(subItem);
});
}
});
}
this.activityShopList = res;
},
// 拿到特价优惠的商品列表 nature 5030
async handleGetSpecialOffers() {
const data = await this.$api.getCoop({
@ -1582,31 +1357,16 @@ export default {
console.log("obj", obj);
console.log("index", index);
if (this.pageType === "UnionMall") {
if (obj.UserdefinedType_Id === "工会活动") {
uni.navigateTo({
url: `/pages/allFunPage/unionActivities`,
});
} else {
uni.redirectTo({
url: `/pages/shopMallPage/shopType/index?leftId=${obj.UserdefinedType_Id}&pageType=${this.pageType}&selectIndex=${index+1}`,
// url: `/pages/shopMallPage/shopType/index?pageType=${this.pageType}`,
});
}
uni.redirectTo({
url: `/pages/shopMallPage/shopType/index?leftId=${obj.UserdefinedType_Id}&pageType=${this.pageType}`,
});
} else {
uni.redirectTo({
url: `/pages/shopMallPage/shopType/index?selectIndex=${index}&pageType=${this.pageType}`,
});
}
},
// 活动直接跳转分类页面 分类页面的互动是第一个 所以 selectIndex 传0就好
handleGoActivityType() {
uni.redirectTo({
url: `/pages/shopMallPage/shopType/index?selectIndex=${0}&pageType=${
this.pageType
}`,
});
},
// 跳转工会之家
// 跳转工会商城
handleGoUnionMall() {
uni.navigateTo({
url: `/pages/shopMallPage/index/index?pageType=UnionMall`,
@ -1970,9 +1730,6 @@ export default {
justify-content: space-between;
.title {
font-size: 14px;
font-weight: 600;
color: #181716;
.titleImg {
width: 112rpx;
height: 36rpx;
@ -2181,8 +1938,7 @@ export default {
.sortBox {
width: 100%;
display: flex;
align-items: flex-start;
// align-items: center;
align-items: center;
justify-content: space-between;
.leftSortBox {
@ -2223,7 +1979,6 @@ export default {
.shopList {
width: 100%;
height: 128rpx;
display: flex;
align-items: center;
justify-content: space-between;
@ -2274,19 +2029,15 @@ export default {
text-align: left;
font-style: normal;
}
.shopList {
width: 100%;
.shopItem {
width: 128rpx;
height: 128rpx;
margin-top: 16rpx;
.shopItem {
.shopImg {
width: 128rpx;
height: 128rpx;
margin-top: 16rpx;
.shopImg {
width: 128rpx;
height: 128rpx;
}
}
}
}
@ -3042,49 +2793,45 @@ export default {
}
.noticePopup {
// width: 90vw;
// height: 75vh;
width: 70vw;
height: calc(2688 * 70vw / 1242);
width: 90vw;
height: 75vh;
background: #fff;
border-radius: 32rpx;
background-image: url(https://eshangtech.com/minTestImg/preSalePoster.jpg);
background-image: url(https://eshangtech.com/minTestImg/noticeBg.png);
background-repeat: no-repeat;
background-size: 100% 100%;
box-sizing: border-box;
padding: 300rpx 120rpx 160rpx;
// .popupContent {
// width: 100%;
// height: 100%;
// overflow-y: auto;
// .title {
// font-family: PingFangSC, PingFang SC;
// font-weight: 600;
// font-size: 24rpx;
// color: #da291a;
// line-height: 40rpx;
// text-align: left;
// font-style: normal;
// }
// .contentText {
// font-family: PingFangSC, PingFang SC;
// font-weight: 400;
// font-size: 24rpx;
// color: #262626;
// line-height: 40rpx;
// text-align: left;
// font-style: normal;
// text-indent: 48rpx;
// }
// .textIndent {
// text-indent: 48rpx;
// }
// }
// .popupContent::-webkit-scrollbar {
// display: none;
// }
.popupContent {
width: 100%;
height: 100%;
overflow-y: auto;
.title {
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 24rpx;
color: #da291a;
line-height: 40rpx;
text-align: left;
font-style: normal;
}
.contentText {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #262626;
line-height: 40rpx;
text-align: left;
font-style: normal;
text-indent: 48rpx;
}
.textIndent {
text-indent: 48rpx;
}
}
.popupContent::-webkit-scrollbar {
display: none;
}
}
.backTopBox {

112
pages/shopMallPage/shopCar/index.vue
View File

@ -8,7 +8,7 @@
@click="handleBackHome"
/>
<view class="pageName">{{
bigPageType === "UnionMall" ? "工会之家购物车" : "购物车"
bigPageType === "UnionMall" ? "工会商城购物车" : "购物车"
}}</view>
<view class="backArrow"></view>
</view>
@ -125,12 +125,7 @@
</view>
</div>
<div class="detailRight">
<div class="title">
<div class="pingnuo" v-if="item.DATAFORMAT === 2">
<div class="pingnuoItem">品诺</div>
</div>
{{ item.COMMODITY_NAME }}
</div>
<div class="title">{{ item.COMMODITY_NAME }}</div>
<div class="otherBox">
<div class="priceBox">
<view>
@ -236,7 +231,6 @@
class="addressItem"
v-for="(item, index) in addressList"
:key="index"
@click="handleClickAddressItem(item)"
>
<view class="addressItemTop">
<view class="itemTopLeft">
@ -244,7 +238,6 @@
:checked="item.MEMBERADDRESS_ID === selectAddressId"
color="#1890FF"
@click="handleChangeAddress(item.MEMBERADDRESS_ID)"
:disabled="!item.MEMBERADDRESS_CODE"
></radio>
<text class="addressText"
>{{ item.ADDRESS || "" }}{{ item.DOORPLATE || "" }}</text
@ -311,7 +304,7 @@ export default {
pageOut: false, // 是不是从立即下单离开页面的
storeId: "",
systemInfo: {},
bigPageType: "", // 页面类型 是不是进来查工会之家的
bigPageType: "", // 页面类型 是不是进来查工会商城的
userInfo: {}, // 最新的用户数据
addressList: [], // 地址列表
showAddressObj: {}, // 当前选中的地址
@ -368,7 +361,6 @@ export default {
this.handleGetNowShopCarList();
this.handleSum();
this.$utils.addUserBehaviorNew();
},
onShow() {
console.log("this.bigPageType", this.bigPageType);
@ -394,15 +386,6 @@ export default {
this.handleGetAddressList();
},
methods: {
// 点击地址
handleClickAddressItem(obj) {
if (!obj.MEMBERADDRESS_CODE) {
uni.showToast({
title: "请完善地址！",
icon: "none",
});
}
},
// 显示选择地址的悬浮框
handleShowAddress() {
this.$refs.addressPopup.open("bottom");
@ -431,24 +414,18 @@ export default {
async handleGetAddressList() {
const data = await this.$api.getCoop({ action_type: "GetAddressList" });
let list = data.Data.List;
let haveMEMBERADDRESSCODEList = [];
let defaultAddress = {};
if (list && list.length > 0) {
list.forEach((item) => {
if (item.ISDEFAULT === 1 && item.MEMBERADDRESS_CODE) {
if (item.ISDEFAULT === 1) {
defaultAddress = item;
}
if (item.MEMBERADDRESS_CODE) {
haveMEMBERADDRESSCODEList.push(item);
}
});
}
console.log("defaultAddress", defaultAddress);
console.log("address", list);
if (!defaultAddress.MEMBERADDRESS_ID) {
if (haveMEMBERADDRESSCODEList && haveMEMBERADDRESSCODEList.length > 0) {
defaultAddress = haveMEMBERADDRESSCODEList[0];
}
defaultAddress = list[0];
}
if (defaultAddress) {
this.showAddressObj = defaultAddress;
@ -771,70 +748,17 @@ export default {
},
// 立即下单
goPayFn() {
// 先检查选中的商品列表里面有没有预售商品
let isPresale = false;
if (this.shopList && this.shopList.length > 0) {
this.shopList.forEach((item) => {
if (item.USERDEFINEDTYPE_PID === 1355 && item.select) {
if (
new Date().getTime() < new Date(item.UPPER_DATE).getTime() ||
new Date().getTime() > new Date(item.OFF_DATE).getTime()
) {
isPresale = true;
// UPPER_DATE
// OFF_DATE
}
}
});
}
console.log("this.shopList", this.shopList);
if (isPresale) {
uni.showToast({
title: "选中的商品中有未售商品，无法下单！",
icon: "none",
});
return;
}
// 判断是不是在工会之家下单 下单的话 就要查询用户余额 余额有的 才能下单
// 判断是不是在工会商城下单 下单的话 就要查询用户余额 余额有的 才能下单
if (this.bigPageType === "UnionMall") {
if (!(this.userInfo.ACCOUNT_BALANCE > 0)) {
uni.showToast({
title: "工会之家余额为0，无法下单！",
title: "工会商城余额不足，无法下单！",
icon: "none",
});
return;
} else if (this.totalPay > Number(this.userInfo.ACCOUNT_BALANCE)) {
// uni.showToast({
// title: "账户余额不足！",
// icon: "none",
// });
// return;
}
}
// 判断当前勾选的商品 中 DATAFORMAT 是不是单一的 若有 2 有 1 则不能去下单页面 都1 都2 可以去
if (
this.shopList &&
this.shopList.length > 0 &&
this.bigPageType !== "UnionMall"
) {
let DATAFORMATTypeList = [];
this.shopList.forEach((item) => {
if (item.select) {
if (DATAFORMATTypeList.indexOf(item.DATAFORMAT) === -1) {
DATAFORMATTypeList.push(item.DATAFORMAT);
}
}
});
console.log("DATAFORMATTypeList", DATAFORMATTypeList);
if (DATAFORMATTypeList && DATAFORMATTypeList.length > 1) {
uni.showToast({
title: "订单中含有品诺商城商品，请去除后下单！",
title: "账户余额不足！",
icon: "none",
});
return;
@ -1092,26 +1016,6 @@ export default {
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
margin-bottom: 8rpx;
.pingnuo {
display: inline-block;
margin-right: 8rpx;
.pingnuoItem {
padding: 4rpx 12rpx;
border-radius: 28rpx;
background: linear-gradient(
90deg,
#ffebe5 0%,
#ffedd8 100%
);
font-family: "PingFangSC";
font-weight: 400;
font-size: 22rpx;
color: #ff7040;
line-height: 30rpx;
text-align: left;
font-style: normal;
}
}
}
.otherBox {

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

@ -8,7 +8,7 @@
@click="handleBackHome"
/>
<view class="pageName">{{
pageType === "UnionMall" ? "工会之家分类" : "分类"
pageType === "UnionMall" ? "工会商城分类" : "分类"
}}</view>
<view class="backArrow"></view>
</view>
@ -54,7 +54,7 @@
></image>
</div>
</div>
<div class="tab_txt_normal">工会之家</div>
<div class="tab_txt_normal">工会商城</div>
</div>
</div>
@ -382,7 +382,7 @@ export default {
shopCarList: [], // 购物车数组
shopCarListLength: 0, // 购物车长度
rightShopList: [], // 右侧商品列表
pageType: "", // 页面类型 是不是进来查工会之家的
pageType: "", // 页面类型 是不是进来查工会商城的
leftId: "", //传入的左侧小类的默认位置
good: {}, // 悬浮框里面 选择规格的商品详情
systemInfo: {},
@ -441,7 +441,7 @@ export default {
this.shopCarList = shopCarList;
}
if (this.pageType === "UnionMall") {
// 工会之家拿到的商品类型
// 工会商城拿到的商品类型
this.handleGetUnionMallShopType();
} else {
// 拿到全部商品类型
@ -449,8 +449,6 @@ export default {
// 拿到全部的商品
// this.handleGetAllShopItem();
}
this.$utils.addUserBehaviorNew();
},
onShow() {
this.menu = uni.getMenuButtonBoundingClientRect();
@ -473,7 +471,7 @@ export default {
}
if (this.pageType === "UnionMall") {
// 工会之家拿到的商品类型
// 工会商城拿到的商品类型
this.handleGetUnionMallShopType();
} else {
// 拿到全部商品类型
@ -625,7 +623,7 @@ export default {
handleClosePop() {
this.$refs.shopPopup.close();
},
// 工会之家拿到的商品类型
// 工会商城拿到的商品类型
async handleGetUnionMallShopType() {
const req = {
ownerUnitId: 911,
@ -649,55 +647,8 @@ export default {
}
});
}
console.log("this.shopTypeList222", resList);
// this.shopTypeList = resList;
// 2025-04-02 写死4个 类型
let newList = [
resList[0],
{
UserdefinedTypeList: [],
UserdefinedType_Desc: "",
UserdefinedType_ICO: "",
UserdefinedType_Id: 3176,
UserdefinedType_Index: 95,
UserdefinedType_Name: "节日慰问",
UserdefinedType_PId: "-1",
},
{
UserdefinedTypeList: [],
UserdefinedType_Desc: "",
UserdefinedType_ICO:
"https://user.eshangtech.com//UploadImageDir/PictureManage/11423/2025_01_12_23_28_36_3470.png",
UserdefinedType_Id: 1250,
UserdefinedType_Index: 60,
UserdefinedType_Name: "观影优惠",
UserdefinedType_PId: -1,
},
{
UserdefinedTypeList: [],
UserdefinedType_Desc: "",
UserdefinedType_ICO:
"https://user.eshangtech.com//UploadImageDir/PictureManage/11423/2025_01_12_23_28_19_4327.png",
UserdefinedType_Id: 1249,
UserdefinedType_Index: 58,
UserdefinedType_Name: "品质蛋糕",
UserdefinedType_PId: -1,
},
{
UserdefinedTypeList: [],
UserdefinedType_Desc: "",
UserdefinedType_ICO:
"https://user.eshangtech.com//UploadImageDir/PictureManage/11462/2025_01_12_22_58_33_6953.png",
UserdefinedType_Id: "工会活动",
UserdefinedType_Index: "",
UserdefinedType_Name: "工会活动",
UserdefinedType_PId: -1,
},
];
this.shopTypeList = newList;
console.log("this.shopTypeList222", this.shopTypeList);
this.shopTypeList = resList;
console.log("this.shopTypeList", this.shopTypeList);
this.handleGetAllShopItem(resList[this.activeTabs].UserdefinedType_Id);
},
// 搜索商品
@ -770,7 +721,7 @@ export default {
uni.hideLoading();
} else {
if (this.pageType === "UnionMall") {
// 工会之家拿到的商品类型
// 工会商城拿到的商品类型
this.handleGetUnionMallShopType();
} else {
// 拿到全部商品类型
@ -789,8 +740,7 @@ export default {
const data = await this.$api.getCoop(req);
let typeList = data.Data.List;
let resList = [];
// let indexOfList = [1248, 1247, 1257, 1245, 1246, 1355];
let indexOfList = [1248, 3175];
let indexOfList = [1248, 1247, 1257, 1245, 1246];
if (typeList && typeList.length > 0) {
typeList.forEach((item) => {
if (indexOfList.indexOf(item.UserdefinedType_Id) !== -1) {
@ -1153,13 +1103,7 @@ export default {
this.activeTabs = index;
this.leftSelectIndex = 0;
console.log("index", index);
if (this.shopTypeList[index].UserdefinedType_Id === "工会活动") {
uni.navigateTo({
url: `/pages/allFunPage/unionActivities`,
})
} else {
this.handleGetAllShopItem(this.shopTypeList[index].UserdefinedType_Id);
}
this.handleGetAllShopItem(this.shopTypeList[index].UserdefinedType_Id);
},
// 改变商品小类
catClickFn(e, index, obj) {
@ -1344,7 +1288,7 @@ export default {
url: `/pages/shopPages/shopList/index?pageType=pointsMall`,
});
},
// 跳转工会之家
// 跳转工会商城
handleGoUnionMall() {
uni.navigateTo({
url: `/pages/shopMallPage/index/index?pageType=UnionMall`,

5
pages/shopMallPage/user/index.vue
View File

@ -11,7 +11,7 @@
@click="handleBackHome"
/>
<text class="pageTitle">{{
pageType === "UnionMall" ? "工会之家我的" : "我的"
pageType === "UnionMall" ? "工会商城我的" : "我的"
}}</text>
<view class="backArrow"></view>
</view>
@ -130,7 +130,7 @@ export default {
Comment_Count: 0, // 待评价
Unpaid_Count: 0, // 待付款
pageType: "", // 页面类型 是不是进来查工会之家的
pageType: "", // 页面类型 是不是进来查工会商城的
shopCarListCount: 0, // 购物车商品数量
};
},
@ -156,7 +156,6 @@ export default {
this.pageType = query.pageType;
}
console.log("this.pageType", this.pageType);
this.$utils.addUserBehaviorNew();
},
onShow() {
if (!this.user.MEMBERSHIP_ID) {

17
pages/shopPages/settlement/components/commodityItem.vue
View File

@ -2,24 +2,11 @@
<div class="flex-row space-x-12">
<img
class="shrink-0 self-start image_9"
:src="
obj.IMAGE_PATH || obj.DEFAULT_IMG || '/static/images/home/defultImg.png'
"
:src="obj.IMAGE_PATH || obj.DEFAULT_IMG || '/static/images/home/defultImg.png'"
/>
<div class="flex-col info">
<div class="flex-row justify-between">
<div class="font_3 titleName" v-if="obj.bracketContent">
<span style="font-weight: 600; color: red">{{
obj.bracketContent
}}</span
><span>{{ obj.restContent || "" }}</span>
</div>
<div class="font_3 titleName" v-else>{{ obj.COMMODITY_NAME || "" }}</div>
<!-- <div class="font_3 titleName">
{{ obj.bracketContent
obj.restContent obj.COMMODITY_NAME }}
</div> -->
<div class="font_3 titleName">{{ obj.COMMODITY_NAME }}</div>
<div class="font_3" style="width: 100px; text-align: right">
x{{ obj.count }}{{ obj.COMMODITY_UNIT }}
</div>

351
pages/shopPages/settlement/index.vue
View File

@ -2,7 +2,7 @@
<div class="settlement" :style="{ overflow: isShow ? 'hidden' : 'auto' }">
<OrderStatus :status="1" v-if="isSubmit" :reservationDate="currentDate" />
<div class="topBox">
<!-- <div class="tabBox">
<div class="tabBox">
<div
@click="handleChangeTab(1)"
:class="selectTab === 1 ? 'tabItem seleTabItem' : 'tabItem'"
@ -15,7 +15,7 @@
>
自提
</div>
</div> -->
</div>
<div
class="address"
v-if="selectTab === 1"
@ -87,22 +87,6 @@
</div>
</div>
<!-- <div class="order_remark margin_auto payBox">
<div class="label">支付方式</div>
<div class="selectBox">
<picker
class="pickerBox"
@change="handlePayTypeChange"
:value="payType"
:range="payTypeList"
range-key="label"
>
<view class="picker"> {{ payTypeList[payType].label }} </view>
</picker>
<img class="rightIcon" src="/static/images/home/rightArrow.png" />
</div>
</div> -->
<div class="order_remark margin_auto">
<div class="title">订单备注</div>
<div class="order_remark_input" v-if="!isSubmit">
@ -113,20 +97,6 @@
</div>
</div>
<!-- <div class="order_remark margin_auto">
<div class="title">营销工号</div>
<div
class="order_remark_input"
style="min-height: 40rpx"
v-if="!isSubmit"
>
<input placeholder="选填" v-model="recommendCode" type="number" />
</div>
<div class="order_remark_cnt" v-else>
{{ recommendCode }}
</div>
</div> -->
<OrderInfo :obj="orderInfo" v-if="isSubmit" />
<div class="place_order">
@ -135,25 +105,7 @@
合计<span class="unit">￥</span
><span class="price">{{ couponOrder }}</span>
</div>
<div
v-if="pageType === 'UnionMall' && payType === 1"
class="place_order_btn"
@click="handleCombinationPayment"
>
组合支付
</div>
<div
v-if="
(pageType === 'UnionMall' && payType === 0) ||
pageType !== 'UnionMall'
"
class="place_order_btn"
@click="createOrder"
>
立即下单
</div>
<div class="place_order_btn" @click="createOrder">立即下单</div>
</div>
<div class="back" v-else @click="handleBackIndex">返回购物车</div>
</div>
@ -259,17 +211,11 @@ export default {
addressInfo: {}, // 选择的地址信息
selectAddressId: 0,
isFirst: true, // 判断是不是第一次进入到页面
pageType: "", // 判断是工会之家 还是 精选商城
pageType: "", // 判断是工会商城 还是 精选商城
userInfo: {}, // 最新的用户信息
selectTab: 1, // 1 是 配送 2 到店自取
phoneNumber: "", // 当前用户的默认手机号
isMakeOrdering: false,
payType: 0, // 默认是立即下单
payTypeList: [
{ label: "立即下单", value: 1 },
{ label: "组合支付", value: 2 },
],
recommendCode: "", // 营销工号
};
},
computed: {
@ -299,30 +245,17 @@ export default {
},
onUnload() {},
async onLoad(option) {
const app = getApp();
if (option.rcmCode) {
this.recommendCode = Number(option.rcmCode);
}
console.log("option", option);
if (option.shopCarList) {
let shopList = JSON.parse(option.shopCarList);
console.log("shopList", shopList);
let sum = 0;
let newList = [];
if (shopList && shopList.length > 0) {
shopList.forEach((item) => {
let obj = this.parseBracketString(item.COMMODITY_NAME);
console.log("obj", obj);
sum += item.count;
newList.push({
...obj,
...item,
});
});
}
this.shopOrder = newList;
console.log("this.shopOrder", this.shopOrder);
this.shopOrder = shopList;
this.shopCount = sum;
}
if (option.addressId) {
@ -337,16 +270,8 @@ export default {
console.log("1");
this.isFirst = false;
this.$utils.addUserBehaviorNew();
},
methods: {
// 选择支付方式的切换
handlePayTypeChange(e) {
console.log("e", e);
this.payType = Number(e.detail.value);
},
// 组合支付
handleCombinationPayment() {},
// 切换tab
handleChangeTab(value) {
this.selectTab = value;
@ -356,30 +281,10 @@ export default {
handleOpenAddress() {
this.$refs.addressPopup.open("bottom");
},
parseBracketString(input) {
const pattern = /【([^】]+)】/;
const match = pattern.exec(input);
if (!match) {
// 如果没有找到【】，直接返回原始字符串
return {
bracketContent: "",
restContent: input,
};
}
// match[0] 是带【】的完整字符串，例如 "【凌云一楼自提】"
// match[1] 是不带【】的字符串，例如 "凌云一楼自提"
const bracketContent = match[0];
// 剩余内容：将匹配到的带【】的部分删掉
const restContent = input.replace(bracketContent, "");
return {
bracketContent,
restContent,
};
},
// 请求该用户的地址列表
async handleGetAddressList() {
const data = await this.$api.getCoop({ action_type: "GetAddressList" });
console.log("handleGetAddressList", data);
console.log("data", data);
let list = data.Data.List;
let defaultAddress = {};
if (list && list.length > 0) {
@ -465,7 +370,6 @@ export default {
return;
}
}
if (this.isMakeOrdering) {
uni.showToast({
title: "请勿连续点击！",
@ -477,36 +381,22 @@ export default {
console.log("_this.user", this.user);
console.log("_this.shopOrder", this.shopOrder);
// 判断这笔订单的 DATAFORMAT 如果 DATAFORMAT 有2 说明是品诺订单 要传3002
let DATAFORMATType = 0;
if (this.shopOrder && this.shopOrder.length > 0) {
this.shopOrder.forEach((item) => {
if (item.SALEDETAIL_DESC) {
} else {
item.SALEDETAIL_DESC = "";
}
DATAFORMATType = item.DATAFORMAT;
});
}
console.log("DATAFORMATType", DATAFORMATType);
let openId = uni.getStorageSync("openId");
console.log("openId", openId);
console.log("this.user", this.user);
const app = getApp();
let req = {
action_type: "ScanOrder",
salebillType:
DATAFORMATType === 2
? "3002"
: this.pageType === "UnionMall"
? "3001"
: "3000",
salebillType: this.pageType === "UnionMall" ? "3001" : "3000",
provinceCode: this.user.PROVINCE_CODE || "530000",
serverpartShopId: "5634",
takeType: this.selectTab === 1 ? 2000 : this.selectTab === 2 ? 1000 : 0, // 1000 自提 邮寄
@ -514,7 +404,6 @@ export default {
(this.remark || "") + (this.selectTab === 1 ? "" : "(用户自提)"),
wechatOpenId: openId || "",
wechatUnionId: this.user.USER_UNIONID || "",
// recommendCode: this.recommendCode,
// tableNumber: '',
// takeType: '',
// packType: '',
@ -527,114 +416,54 @@ export default {
: this.phoneNumber,
// couponCode: '',//优惠券
t_saleorderdetail: JSON.stringify(this.shopOrder),
recommendCode: app.globalData.recommendCode || "",
recommendId: app.globalData.recommendId || "",
requestType: "application/x-www-form-urlencoded",
// const scanParams = app.globalData.recommendCode;
// const scanParams2 = app.globalData.recommendId;
};
console.log("req", req);
console.log("this.addressInfo", this.addressInfo);
const data = await this.$api.postCoop(req);
console.log("data", data);
if (data.ResultCode === "100") {
let [provinceId, cityId, districtId, streetId] =
this.addressInfo.MEMBERADDRESS_CODE.split(",");
let skuBase = [];
let priceContentBase = [];
if (this.shopOrder && this.shopOrder.length > 0) {
this.shopOrder.forEach((item) => {
skuBase.push({
skuId: item.SELLER_ID,
num: item.count,
// recharge_amount: item.COMMODITY_MEMBERPRICE,
});
priceContentBase.push({
skuId: item.SELLER_ID,
price: item.COMMODITY_PURCHASEPRICE,
});
});
let shopCarList = [];
if (this.pageType === "UnionMall") {
shopCarList = this.$store.state.unionMyShopCar;
} else {
shopCarList = this.$store.state.myShopCar;
}
let req = {
receiver: this.addressInfo.USER_NAME, // 收货人
mobile: this.addressInfo.MOBILEPHONE,
ordererMobile: this.addressInfo.MOBILEPHONE,
lnglat: "",
provinceId: provinceId,
cityId: cityId,
districtId: districtId,
streetId: streetId,
address: this.addressInfo.DOORPLATE,
skuBase: skuBase,
erpCode: "",
remark: "",
thirdOrderSn: data.Data.SALEBILL_CODE,
delivery_type: 1,
expect_date: "",
expect_time: "",
priceContentBase: priceContentBase,
};
const pingnuoData = await this.$api.$postNode(
"/pino/order/submit",
req
);
console.log("pingnuoData", pingnuoData);
if (pingnuoData.code === 200) {
let shopCarList = [];
if (this.pageType === "UnionMall") {
shopCarList = this.$store.state.unionMyShopCar;
} else {
shopCarList = this.$store.state.myShopCar;
}
if (shopCarList && shopCarList.length > 0) {
let newList = [];
shopCarList.forEach((item) => {
let find = false;
this.shopOrder.forEach((subItem) => {
if (item.COMMODITY_ID === subItem.COMMODITY_ID) {
find = true;
}
});
if (find) {
} else {
newList.push(item);
if (shopCarList && shopCarList.length > 0) {
let newList = [];
shopCarList.forEach((item) => {
let find = false;
this.shopOrder.forEach((subItem) => {
if (item.COMMODITY_ID === subItem.COMMODITY_ID) {
find = true;
}
});
// list
if (this.pageType === "UnionMall") {
this.$store.commit("unionMyShopCar", newList);
if (find) {
} else {
this.$store.commit("myShopCar", newList);
newList.push(item);
}
} else {
if (this.pageType === "UnionMall") {
this.$store.commit("unionMyShopCar", []);
} else {
this.$store.commit("myShopCar", []);
}
}
// 判断是工会之家下单 还是精选商城下单
// 精选商城 调用微信支付 工会之家是调用余额支付
});
// list
if (this.pageType === "UnionMall") {
this.handleBalancePayment(data.Data);
this.$store.commit("unionMyShopCar", newList);
} else {
this.getOrderInfo(data.Data);
this.$store.commit("myShopCar", newList);
}
} else {
uni.showModal({
title: "提示",
content: `${pingnuoData.data.description}`,
success: function (res) {},
});
this.isMakeOrdering = false;
if (this.pageType === "UnionMall") {
this.$store.commit("unionMyShopCar", []);
} else {
this.$store.commit("myShopCar", []);
}
}
// 判断是工会商城下单 还是精选商城下单
// 精选商城 调用微信支付 工会商城是调用余额支付
if (this.pageType === "UnionMall") {
this.handleBalancePayment(data.Data);
} else {
this.getOrderInfo(data.Data);
}
} else {
// uni.showToast({
@ -652,7 +481,6 @@ export default {
},
// 余额支付
async handleBalancePayment(obj) {
let _this = this;
console.log("this.user", this.user);
console.log("obj", obj);
@ -668,17 +496,12 @@ export default {
console.log("this.userInfo", this.userInfo);
uni.hideLoading();
// 判断余额是否不足
let insufficientBalance = false;
if (this.userInfo.ACCOUNT_BALANCE < Number(obj.PAY_AMOUNT)) {
insufficientBalance = true;
// uni.showToast({
// title: "余额不足！无法支付",
// icon: "none",
// });
// this.isMakeOrdering = false;
// return;
uni.showToast({
title: "余额不足！无法支付",
icon: "none",
});
return;
}
const req = {
@ -686,41 +509,22 @@ export default {
saleBill: obj.SALEBILL_ID,
industryMembershipId: this.user.INDUSTRY_MEMBERSHIP_ID,
requestType: "application/x-www-form-urlencoded",
mixPay: insufficientBalance ? 1 : "", // 组合支付的时候传1
};
const data = await this.$api.postCoop(req);
console.log("data", data);
if (data.ResultCode === "100") {
if (insufficientBalance) {
uni.showModal({
title: "提示",
content: `当前积分${this.userInfo.ACCOUNT_BALANCE}，还需额外支付${data.ResultData}元`,
success: function (res) {
if (res.confirm) {
uni.showLoading({
title: "进行组合支付...",
});
_this.getOrderInfo(obj, data.ResultData);
uni.hideLoading();
} else if (res.cancel) {
}
},
this.isMakeOrdering = false;
uni.showToast({
title: "支付成功！",
icon: "none",
});
setTimeout(() => {
uni.redirectTo({
url: `/pages/order/orderdetail/index?orderInternal=${obj.SALEBILL_ID}`,
});
} else {
this.isMakeOrdering = false;
uni.showToast({
title: "支付成功！",
icon: "none",
});
setTimeout(() => {
uni.redirectTo({
url: `/pages/order/orderdetail/index?orderInternal=${obj.SALEBILL_ID}`,
});
}, 1500);
}
}, 1500);
}
},
// 生成订单号
generateOutTradeNo(length) {
// 定义允许的字符集
@ -745,8 +549,7 @@ export default {
},
// 生成一个符合要求的商户订单号（长度为16的示例）
// 获取后台信息调取微信支付
async getOrderInfo(obj, payMoney) {
// payMoney 工会之家订单 组合支付时可能会出现的值
async getOrderInfo(obj) {
let _this = this;
console.log("_this.couponOrder", _this.couponOrder);
// 拿到签名
@ -760,12 +563,12 @@ export default {
let req = {
appid: "wxee018fb96955552a", // 公众账号ID
mchid: "1672298991", // 商户号
description: "彩云驿出行", //商品描述
description: "彩云驿商城", //商品描述
out_trade_no: out_trade_no, // 商户订单号
notify_url:
"https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
amount: {
total: payMoney ? payMoney * 100 : Number(obj.PAY_AMOUNT) * 100 || 1,
total: Number(obj.PAY_AMOUNT) * 100 || 1,
currency: "CNY",
}, // 订单金额
payer: {
@ -783,8 +586,16 @@ export default {
"\n" +
JSON.stringify(req) +
"\n",
provinceCode: _this.provinceCode || "530000",
};
console.log(
"POST\n/v3/pay/transactions/jsapi\n" +
timeStamp +
"\n" +
nonceStr +
"\n" +
JSON.stringify(req) +
"\n"
);
const data = await this.$api.$get("/WeChat/GenerateSign", reqSign);
console.log("data3213123", data.Result_Data);
@ -824,9 +635,7 @@ export default {
package: `prepay_id=${res.data.prepay_id}`,
signType: "RSA",
paySign: paySign,
total_fee: payMoney
? payMoney * 100
: Number(obj.PAY_AMOUNT) * 100 || 1,
total_fee: Number(obj.PAY_AMOUNT) * 100 || 1,
success(res) {
console.log("res", res);
},
@ -1377,32 +1186,6 @@ export default {
background: #fefffe;
}
.payBox {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
.label {
font-size: 14px;
font-weight: 600;
}
.selectBox {
display: flex;
align-items: center;
.pickerBox {
font-size: 28rpx;
font-family: "PingFang SC";
line-height: 34rpx;
color: #9fa3a8;
}
.rightIcon {
width: 18rpx;
height: 18rpx;
margin-left: 8rpx;
}
}
}
uni-modal .uni-modal__bd {
white-space: pre-wrap;
}

15
pages/shopPages/settlementFood/index.vue
View File

@ -663,7 +663,7 @@ export default {
let req = {
appid: "wxee018fb96955552a", // 公众账号ID
mchid: "1672298991", // 商户号
description: "彩云驿出行", //商品描述
description: "彩云驿商城", //商品描述
out_trade_no: out_trade_no, // 商户订单号
notify_url:
"https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
@ -686,8 +686,16 @@ export default {
"\n" +
JSON.stringify(req) +
"\n",
provinceCode: _this.provinceCode || "530000",
};
console.log(
"POST\n/v3/pay/transactions/jsapi\n" +
timeStamp +
"\n" +
nonceStr +
"\n" +
JSON.stringify(req) +
"\n"
);
const data = await this.$api.$get("/WeChat/GenerateSign", reqSign);
console.log("data3213123", data.Result_Data);
@ -696,7 +704,7 @@ export default {
console.log("AuthorizationStr", AuthorizationStr);
uni.request({
url: "https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi",
url: "https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi", //仅为示例，并非真实接口地址。
method: "POST",
data: req,
header: {
@ -977,7 +985,6 @@ export default {
console.log("this.shopOrder", this.shopOrder);
// this.getDicretion(option)
this.$utils.addUserBehaviorNew();
},
};
</script>

1
pages/shopPages/shop/index.vue
View File

@ -1114,7 +1114,6 @@ export default {
} else {
this.goodsH = goodsHeight;
}
this.$utils.addUserBehaviorNew();
},
onUnload() {
this.$store.commit("couponPrice", "");

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

@ -143,13 +143,6 @@
<!-- {{ good.COMMODITY_MEMBERPRICE || "-" }} -->
</span>
</div>
<div class="originalPrice" v-if="pageType === 'UnionMall'">
<span class="unit">¥</span>
<span class="oldPrice">
{{ good.RETbigNumber || "" }}.{{ good.RETsmallNumber || "00" }}
</span>
</div>
</div>
<div>
<!-- <span class="sale-count">
@ -183,10 +176,6 @@
<div>分享</div>
</button>
</div>
<div class="product-brand" v-if="good.REMINDER_DAY">
<view class="inventory">{{ `平均${good.REMINDER_DAY}天内发货` }}</view>
</div>
</div>
<div
@ -196,6 +185,7 @@
new Date(good.UPPER_DATE).getTime() > new Date().getTime() ||
good.SEND_MODE > 0 ||
good.DELIVER_AREA ||
good.LIMIT_TOTALCOUNT > 0 ||
good.LIMIT_TOTALCOUNT > 0
"
>
@ -204,17 +194,10 @@
style="width: 100%; box-sizing: border-box; padding: 0 32rpx"
>
<view v-if="new Date(good.UPPER_DATE).getTime() > new Date().getTime()"
>预售时间：{{
good.UPPER_DATE && good.OFF_DATE
? `${good.UPPER_DATE || "-"}-${good.OFF_DATE || "-"}`
: good.UPPER_DATE && !good.OFF_DATE
? `${good.UPPER_DATE || "-"}起`
: ""
>预售时间：{{ good.UPPER_DATE || "-" }}-{{
good.OFF_DATE || "-"
}}</view
>
<!-- 预售时间：{{ good.UPPER_DATE || "-" }}-{{
good.OFF_DATE || "-"
}} -->
<view>{{
good.SEND_MODE === 1000
? "发货模式：自提"
@ -226,9 +209,7 @@
}}</view>
<view>{{
good.DELIVER_AREA
? `配送区域：${good.DELIVER_AREA || "仅限云南省即江浙沪包邮区购买"}`
: ""
good.DELIVER_AREA ? "配送区域：仅限云南省即江浙沪包邮区购买" : ""
}}</view>
<view>{{
good.LIMIT_TOTALCOUNT
@ -243,31 +224,6 @@
</view>
</div>
<div
class="product-detail"
style="background: #fff; padding: 16rpx 0"
v-if="good.AFTERSALE_NATRUE"
>
<view
class="detail-right"
style="width: 100%; box-sizing: border-box; padding: 0 32rpx"
>
<view>{{
good.AFTERSALE_NATRUE
? `${
good.AFTERSALE_NATRUE === 1000
? "仅支持退货"
: good.AFTERSALE_NATRUE === 2000
? "仅支持换货"
: good.AFTERSALE_NATRUE === 3000
? "支持退货和换货"
: ""
}`
: ""
}}</view>
</view>
</div>
<div
class="product-detail"
style="padding-bottom: 16rpx"
@ -378,24 +334,17 @@
> -->
<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.COMMODITY_STOCK > 0 && !isCountdown"
v-if="good.COMMODITY_STOCK > 0"
>
立即购买
</div>
<div
class="sellOut"
@click="handleShowShopPopup(3)"
v-if="good.COMMODITY_STOCK === 0 && !isCountdown"
v-if="good.COMMODITY_STOCK === 0"
>
已售罄
</div>
@ -423,11 +372,6 @@
</div> -->
</div>
<!-- 预售倒计时 -->
<div class="countdown" v-if="isCountdown">
此商品为预售商品，起售倒计时 {{ countdown || "" }}
</div>
<uni-popup
:show="showShareBox"
position="bottom"
@ -574,6 +518,7 @@ import { mapGetters, mapActions, mapMutations } from "vuex";
export default {
data() {
const windows = uni.getSystemInfoSync();
return {
pageMsg: {
current: 0,
@ -617,10 +562,7 @@ export default {
showTopFixed: false, // 顶部显示的锚点tab
pageTab: 1, // 锚点tab的选中
scrollView: "", // 滚动的锚点
pageType: "", // 页面类型 UnionMall 为工会之家
countdown: "", // 存储倒计时的显示内容
isCountdown: false, // 判断是否进入到倒计时
timer: null, // 定时器
pageType: "", // 页面类型 UnionMall 为工会商城
};
},
components: {
@ -642,32 +584,6 @@ export default {
setOrder: "ORDERGOOD",
}),
...mapMutations(["setInvitedCode"]),
// 倒计时方法
startCountdown(targetTime) {
console.log("targetTime", targetTime);
let target = new Date(targetTime); // 目标时间
let _this = this;
this.timer = setInterval(() => {
let now = new Date(); // 当前时间
let timeDiff = target - now; // 目标时间与当前时间的差值（毫秒）
if (timeDiff <= 0) {
clearInterval(this.timer); // 倒计时结束，停止定时器
_this.isCountdown = false;
_this.countdown = "";
} else {
// 计算剩余时间的小时、分钟和秒数
let hours = Math.floor(timeDiff / (1000 * 60 * 60)); // 小时
let minutes = Math.floor((timeDiff % (1000 * 60 * 60)) / (1000 * 60)); // 分钟
let seconds = Math.floor((timeDiff % (1000 * 60)) / 1000); // 秒
// 格式化为“时:分:秒”
_this.countdown = ` ${hours}时${minutes}分${seconds}秒`;
}
}, 1000); // 每秒更新一次
},
// 输入框里面的数量
haveFocus(e, item) {
console.log("e", e);
@ -882,29 +798,7 @@ export default {
}, 2000);
},
// 立即购买方法
async handleMakeOrder() {
let userInfo = {};
if (this.pageType === "UnionMall") {
// 获取最新的用户余额
uni.showLoading({
title: "获取用户余额...",
});
const userData = await this.$api.getCoop({
action_type: "GetMembershipInfo",
WechatUserId: this.user.WechatUserId,
});
userInfo = userData.Data;
console.log("this.userInfo", this.userInfo);
uni.hideLoading();
if (!(userInfo && userInfo.ACCOUNT_BALANCE > 0)) {
uni.showToast({
title: "您被纳入工会会员采购名录，如有疑问，请联系工会咨询",
icon: "none",
});
return;
}
}
handleMakeOrder() {
if (
this.good.SKULIST &&
this.good.SKULIST.length > 0 &&
@ -996,14 +890,9 @@ export default {
this.good = obj;
this.$forceUpdate();
},
// 打开购物车 或 立即购买的悬浮框 1 打开购物车 2 立即购买 3售罄 4预售
// 打开购物车 或 立即购买的悬浮框 1 打开购物车 2 立即购买 3售罄
handleShowShopPopup(type) {
if (type === 4) {
uni.showToast({
title: "商品预售中",
icon: "none",
});
} else if (type === 3) {
if (type === 3) {
uni.showToast({
title: "商品已售罄",
icon: "none",
@ -1105,15 +994,6 @@ export default {
_this.good.ContentImgList.map((n) => {
_this.detailImgList.push({ width: 750, height: 400 });
});
if (
new Date(_this.good.UPPER_DATE).getTime() > new Date().getTime()
) {
_this.isCountdown = true;
_this.startCountdown(_this.good.UPPER_DATE);
} else {
_this.isCountdown = false;
}
});
},
getRate() {
@ -1523,7 +1403,6 @@ export default {
this.isShowCount = false;
this.showSharePro = false;
this.good = {};
clearInterval(this.timer);
},
onLoad(option) {
this.menu = uni.getMenuButtonBoundingClientRect();
@ -1545,7 +1424,6 @@ export default {
}
this.getDetail(option.id);
this.$utils.addUserBehaviorNew();
// if (option.scene) {
// // 是否是商品分享码扫入的 带有他人的邀请码
// let scene = decodeURIComponent(option.scene);
@ -1788,20 +1666,6 @@ hr {
}
}
.originalPrice {
display: inline-block;
margin-left: 16rpx;
.unit {
font-size: 24rpx;
color: #999999;
}
.oldPrice {
font-size: 28rpx;
color: #999999;
text-decoration: line-through;
}
}
// .share-btn:before
// content ''
// height 31rpx
@ -2084,9 +1948,6 @@ button:after {
background: #bbbbbb;
border-radius: 0 16rpx 16rpx 0;
}
.presale {
background: #ffae00;
}
}
.shopcart-btn:before {
@ -2145,25 +2006,6 @@ button:after {
}
}
.countdown {
width: 100%;
height: 64rpx;
background: #fff2e7;
position: fixed;
left: 0;
bottom: 124rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 28rpx;
color: #ff8417;
line-height: 32rpx;
text-align: justify;
font-style: normal;
display: flex;
align-items: center;
justify-content: center;
}
.popup-box {
padding: 50rpx 40rpx 32rpx;
font-size: 28rpx;

1
pages/shopPages/shopList/index.vue
View File

@ -125,7 +125,6 @@ export default {
this.pageType = query.pageType === "brand" ? "UnionMall" : query.pageType;
this.menu = uni.getMenuButtonBoundingClientRect();
this.handleGetShopList(query.type);
this.$utils.addUserBehaviorNew();
},
methods: {
// 找到对应类型的商品列表

1
pages/storeDetail/index.vue
View File

@ -539,7 +539,6 @@ export default {
this.getCouponList(options.id);
this.getFoodImages(options.id);
this.getShop(options.id);
this.$utils.addUserBehaviorNew();
},
onPullDownRefresh() {
// let _this = this

64
pages/user/index.vue
View File

@ -98,7 +98,7 @@
<!-- 我的商城订单栏 -->
<view class="orderFun">
<view class="boxTitleTop" @click="handleGoOrder(0, '')">
<view class="boxTitleTop" @click="handleGoOrder(0)">
<text class="boxTitle">商城订单</text>
<image class="rightArrow" src="/static/images/home/rightArrow.svg" />
</view>
@ -108,7 +108,7 @@
class="orderFunItem"
v-for="(item, index) in orderFunList"
:key="index"
@click="handleGoOrder(item.value, '')"
@click="handleGoOrder(item.value)"
>
<image class="orderFunIcon" :src="item.src" />
<text class="orderFunText">{{ item.label }}</text>
@ -129,43 +129,6 @@
</view>
</view>
</view>
<!-- 工会之家订单栏 -->
<view class="orderFun">
<view class="boxTitleTop" @click="handleGoOrder(0, 'UnionMall')">
<text class="boxTitle">工会订单</text>
<image class="rightArrow" src="/static/images/home/rightArrow.svg" />
</view>
<view class="orderContent">
<view class="orderLeft">
<view
class="orderFunItem"
v-for="(item, index) in orderFunList"
:key="index"
@click="handleGoOrder(item.value, 'UnionMall')"
>
<image class="orderFunIcon" :src="item.src" />
<text class="orderFunText">{{ item.label }}</text>
</view>
</view>
<!-- <view class="orderRight">
<view
class="orderFunItem"
@click="
handleGo(
`/pages/order/buyOrder/index?type=6&pageType=UnionMall`
)
"
>
<image
class="orderFunIcon"
src="/static/images/home/afterSales.svg"
/>
<text class="orderFunText">退换/售后</text>
</view>
</view> -->
</view>
</view>
<!-- 我的点餐订单栏 -->
<view class="orderFun">
@ -337,7 +300,6 @@ export default {
this.menu = uni.getMenuButtonBoundingClientRect();
let height = uni.getStorageSync("safeHeight");
this.safeHeight = Number(height);
this.$utils.addUserBehaviorNew();
},
onShow() {
console.log("this.user", this.user);
@ -465,20 +427,10 @@ export default {
},
// 最底下的两个点击事件
handleLastFun(value) {
console.log("value", value);
if (value === 1) {
// 客服帮助
// uni.navigateTo({
// url: `/pages/noDataPage/index`,
// });
wx.openCustomerServiceChat({
extInfo: {
url: "", // 客服链接
}, // 客服信息
corpId: "", //企业ID
success(res) {
console.log("res", res);
},
uni.navigateTo({
url: `/pages/noDataPage/index`,
});
} else if (value === 2) {
// 服务热线
@ -488,16 +440,14 @@ export default {
}
},
// 跳转订单
handleGoOrder(value, pageType) {
handleGoOrder(value) {
if (value === 4) {
uni.navigateTo({
url: `/pages/evaluateList/index?pageType=${pageType}`,
url: `/pages/evaluateList/index`,
});
} else {
uni.navigateTo({
url: `/pages/order/buyOrder/index?type=${
value || ""
}&pageType=${pageType}`,
url: `/pages/order/buyOrder/index?type=${value || ""}`,
});
}
},

1
static/images/home/ETCmap.svg
View File

@ -1 +0,0 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1743385078564" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15736" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M257.125955 955.459298c156.450224 90.569713 348.974824 91.337252 506.192589 2.558466C634.627681 832.524985 368.675093 619.660575 7.931323 591.389521c23.665815 151.461214 114.363451 286.03655 249.194632 364.069777z" fill="#FF9929" p-id="15737"></path><path d="M948.679438 778.541342c47.971246-78.92869 74.579297-170.649713 74.579297-266.208434 0-182.802428-97.349649-351.789138-255.334952-443.12639-157.985304-91.465176-352.684601-91.465176-510.797828 0C99.140652 160.671693 1.791003 329.530479 1.791003 512.332908c0 20.211885 1.15131 40.295847 3.581853 60.123961 67.287668-2.814313 392.596678-3.07016 943.306582 206.084473zM550.582058 483.16639c-2.430543 19.444345-21.874888 31.724984-41.319233 26.735975h-2.430544c-2.430543 0-4.861086-4.861086-4.861086-7.29163l19.444345-92.616486c2.430543-19.444345 21.874888-31.724984 41.319233-26.735974h2.430544c2.430543 0 4.861086 2.430543 4.861086 7.291629l-19.444345 92.616486zM701.403655 319.808307h111.932908c4.861086 0 7.291629 2.430543 7.291629 4.861086v2.430543c0 19.444345-19.444345 36.58607-43.749776 36.586071h-31.597061c-17.013802 0-31.597061 12.152716-36.458147 29.294441l-12.152716 63.322044c-2.430543 7.291629 2.430543 12.152716 7.29163 12.152716h72.916294c24.305431 0 43.749776 17.013802 43.749776 36.58607v2.430543c0 2.430543-2.430543 4.861086-7.291629 4.861087H681.95931c-24.305431 0-41.319233-19.444345-36.458147-41.447157l26.735975-134.063642c2.430543-9.594249 14.583259-17.013802 29.166517-17.013802z m-250.473866 36.58607c0-19.444345 17.013802-36.58607 36.458147-36.58607h162.974314c2.430543 0 4.861086 2.430543 4.861086 4.861086v2.430543c0 19.444345-14.583259 36.58607-36.458147 36.586071H455.790876c-2.430543 0-4.861086-2.430543-4.861087-4.861087v-2.430543z m-216.446262-2.430543c0-19.444345 17.013802-36.58607 36.458147-36.58607h162.974313c4.861086 0 7.291629 2.430543 7.29163 4.861086v2.430543c0 19.444345-17.013802 36.58607-36.458147 36.58607H241.775157c-4.861086 0-7.291629-2.430543-7.29163-4.861086v-2.430543z m-29.294441 131.633099l9.722173-51.169329c4.861086-21.874888 24.305431-41.447157 43.749776-43.8777h124.085623c4.861086 0 7.291629 2.430543 7.29163 4.861087v2.430543c0 19.444345-17.013802 36.58607-36.458147 36.58607h-75.346837c-7.291629 0-14.583259 7.291629-17.013802 14.583259l-2.430543 9.722172c0 4.861086 2.430543 7.291629 4.861086 7.29163h111.932907c19.444345 0 34.027604 14.583259 36.458147 36.58607v2.430543c0 2.430543-4.861086 4.861086-7.291629 4.861087H222.330812c-12.280639 0-19.572268-12.152716-17.141726-24.305432zM780.076499 787.751822c-36.458147-19.444345-75.346837-36.58607-114.363451-53.599873-4.861086-2.430543-9.722173 0-12.152715 4.861087-2.430543 4.861086 0 9.722173 4.861086 12.152715 38.88869 17.013802 77.77738 36.58607 114.36345 53.599872 4.861086 2.430543 9.722173 0 12.152716-4.861086 2.430543-4.861086 0-9.722173-4.861086-12.152715zM972.21733 894.951566c0-2.430543-2.430543-4.861086-4.861087-7.291629-38.88869-24.305431-75.346837-46.308243-111.932907-65.752588-4.861086-2.430543-9.722173 0-12.152716 4.861086-2.430543 4.861086 0 9.722173 4.861087 12.152716 36.458147 19.444345 72.916294 41.447157 111.932907 68.183131h4.861086c2.430543 0 4.861086-2.430543 4.861087-4.861087v-2.430543c4.861086-2.430543 4.861086-4.861086 2.430543-4.861086z" fill="#FF9929" p-id="15738"></path><path d="M458.988959 660.979809h-4.861087c-2.430543 0-4.861086 2.430543-4.861086 4.861086v4.861086c0 2.430543 2.430543 2.430543 4.861086 4.861086 43.749776 14.583259 85.06901 29.294441 126.516167 43.8777 4.861086 2.430543 9.722173 0 12.152715-4.861086 0-2.430543-2.430543-7.291629-7.291629-9.722173-41.319233-14.583259-82.638467-29.294441-126.516166-43.877699z" fill="#FF9929" p-id="15739"></path></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 3.9 KiB

2
static/images/home/filterIcon.svg
View File

@ -2,7 +2,7 @@
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组_13@2x</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工会之家" transform="translate(-481.000000, -838.000000)">
<g id="工会商城" transform="translate(-481.000000, -838.000000)">
<g id="编组-15" transform="translate(481.000000, 838.000000)">
<rect id="矩形" x="0" y="0" width="16" height="16"></rect>
<path d="M14,1.6 L14.4,3.46577994 L10.5397879,6.43243188 C10.1197921,6.73282815 9.87058799,7.21745353 9.87058799,7.73382006 L9.87058799,13.41846 C9.79544844,13.6276102 9.70109351,13.7820522 9.57662971,13.8659469 L6.37933456,12.6967301 L6.12941167,7.73385697 C6.12941167,7.21745748 5.88017594,6.73280537 5.46013577,6.43241445 L1.76731897,3.79150366 L1.6,2 L14,1.6 Z" id="路径" stroke="#716F69" stroke-width="1.2"></path>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1016 B

After

Width:  |  Height:  |  Size: 1016 B

1
static/images/home/newEtc.svg
View File

@ -1 +0,0 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1743385335879" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="22575" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M512 0c283.733333 0 512 228.266667 512 512S795.733333 1024 512 1024 0 795.733333 0 512 228.266667 0 512 0z" fill="#FF9929" p-id="22576"></path><path d="M768 648.533333c8.533333 0 23.466667-2.133333 34.133333 0v68.266667h-68.266666c-44.8 0-119.466667-51.2-119.466667-204.8 0-136.533333 53.333333-198.4 119.466667-204.8h68.266666v68.266667H768c-53.333333 0-85.333333 44.8-85.333333 136.533333 0 0-6.4 136.533333 85.333333 136.533333z m-221.866667 68.266667h-68.266666v-341.333333H426.666667v-68.266667h170.666666v68.266667h-51.2v341.333333zM221.866667 307.2h170.666666v68.266667h-102.4v102.4h102.4v68.266666h-102.4v102.4h102.4v68.266667h-170.666666V307.2z" fill="#ffffff" p-id="22577" data-spm-anchor-id="a313x.search_index.0.i9.407b3a81IKfSlj" class="selected"></path></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
static/images/tabbar/CYYIconNew.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 105 KiB

5
store/mutations.js
View File

@ -69,10 +69,7 @@ const mutations = {
},
severList(state, v) {
state.severList = v
},
setVisitChannels(state, data) {
state.visitChannels = data
},
}
}
export default mutations

6
store/state.js
View File

@ -3,7 +3,7 @@ const state = {
InviteCode: '', // 被邀请码
shopcartOrder: {}, // 购物车信息
myShopCar: [], // 购物车信息
unionMyShopCar: [], // 工会之家购物车信息
unionMyShopCar: [], // 工会商城购物车信息
nowStore: {}, // 当前点餐的商家信息
orderNumber: '', // 订单号
orderInternal: '', // 订单内码
@ -21,9 +21,7 @@ const state = {
serverPart: '', // 用户首页当前选中的服务区信息 （首页和发现）
discoveryServerPart: '', // 用户发现的服务区信息
appointServerPart: '', // 用户预约页面的服务区信息
ownerUnitId: '' ,// 当前定位业主id
visitChannels: '',
ownerUnitId: '' // 当前定位业主id
}
export default state

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/common/runtime.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.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/shopMallPage/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/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

Some files were not shown because too many files have changed in this diff Show More