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

update

Browse Source
This commit is contained in:
ylj20011123 2025-06-25 19:35:46 +08:00
parent 5d303c310b
commit ec1487dc85
112 changed files with 3976 additions and 2087 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
pages/allFunPage/index.vue
View File

@ -6,24 +6,12 @@
}}</view>
<view v-if="managering">
<l-drag-sort
:list="allFunList"
@change="change"
:lineHeight="112"
></l-drag-sort>
<l-drag-sort :list="allFunList" @change="change" :lineHeight="112"></l-drag-sort>
</view>
<view v-if="!managering" class="funList">
<view
class="funItem"
v-for="(item, index) in allFunList"
:key="index"
@click="handleFunClick(item)"
>
<view class="funItem" v-for="(item, index) in allFunList" :key="index" @click="handleFunClick(item)">
<view class="funLeft">
<image
class="funIcon"
:src="pageType === 'spring' ? item.springSrc : item.src"
/>
<image class="funIcon" :src="pageType === 'spring' ? item.springSrc : item.src" />
<text class="funText">{{ item.label || "-" }}</text>
</view>
<view class="funRight">
@ -32,6 +20,19 @@
</view>
</view>
</view>
<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>
</view>
</template>
@ -66,6 +67,18 @@ export default {
uni.setStorageSync("funList", JSON.stringify(this.allFunList));
},
methods: {
// 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);
@ -89,9 +102,10 @@ export default {
});
} else if (obj.value === 4) {
// ETC
uni.navigateToMiniProgram({
appId: "wxb228568a0a4f7120",
});
// uni.navigateToMiniProgram({
// appId: "wxb228568a0a4f7120",
// });
this.$refs.ETCRef.open("center");
} else if (obj.value === 5) {
// 点餐
uni.navigateTo({
@ -259,5 +273,45 @@ export default {
}
}
}
.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;
}
}
}
}
</style>

140
pages/index/index.vue
View File

@ -156,6 +156,16 @@
</view>
</view>
<!-- 附近的服务区 -->
<!-- <view class="nearbyScenic">
<view class="nearbyScenicTop">
<view class="nearbyScenicTopTitle">附近景区</view>
<view class="nearbyScenicTopRightBox">
<view class="nearbyScenicTopRightBoxText"></view>
</view>
</view>
</view> -->
<!-- 高速路况播报 -->
<view class="roadStatus" @click="handleGoHighWay">
<view class="roadTop">
@ -299,7 +309,8 @@
<!-- 广告 -->
<uni-popup ref="noticeRef">
<view class="noticePopup" @click="handleHidePopup">
<view class="noticePopup" :style="{ backgroundImage: `url(${poster ? poster.USERDEFINEDTYPE_ICO : ''})` }"
@click="handleHidePopup">
<img class="closeIcon" @click.stop="handleCloseNotice"
src="https://eshangtech.com/ShopICO/ahyd-BID/examine/close.svg" />
</view>
@ -459,7 +470,7 @@ export default {
swiperList: [
// "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg",
// "http://saas.eshangtech.com/minTestImg/DragonBoatFestival.jpg",
"http://saas.eshangtech.com/minTestImg/banner_0619_0625.png",
// "https://eshangtech.com/minTestImg/banner_0626_0702.png",
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg",
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥_1.jpg",
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区_1.jpg",
@ -467,7 +478,7 @@ export default {
previewImageList: [
// "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg",
// "http://saas.eshangtech.com/minTestImg/DragonBoatFestival.jpg",
"http://saas.eshangtech.com/minTestImg/banner_0619_0625.png",
// "https://eshangtech.com/minTestImg/banner_0626_0702.png",
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/正太泰国榴莲.jpg",
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg",
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥.jpg",
@ -490,22 +501,12 @@ export default {
showPoster: true, // 判断是否显示海报
isChangeIcon: true, // 判断是否切换商城的图表
triggered: false,
poster: {},// 海报信息
};
},
async onLoad() {
let stronge = uni.getStorageSync("showIndexPoster");
// this.$refs.noticeRef.open("center");
if (new Date("2025-06-19 00:00:00").getTime() < new Date().getTime() && new Date("2025-06-25 23:59:59").getTime() > new Date().getTime()) {
this.$refs.noticeRef.open("center");
let _this = this
setTimeout(() => {
_this.$refs.noticeRef.close();
}, 8000)
} else {
this.showPoster = false;
}
this.menu = uni.getMenuButtonBoundingClientRect();
let systemInfo = uni.getSystemInfoSync();
@ -547,6 +548,22 @@ export default {
uni.setStorageSync("funList", JSON.stringify(this.funList));
}
await this.handleGetAdvertisementData()
console.log('this.poster', this.poster);
// this.$refs.noticeRef.open("center");
// if (new Date("2025-06-25 00:00:00").getTime() < new Date().getTime() && new Date("2025-07-02 23:59:59").getTime() > new Date().getTime()) {
if (new Date(this.poster.PRESALE_STARTTIME).getTime() < new Date().getTime() && new Date(this.poster.PRESALE_ENDTIME).getTime() > new Date().getTime()) {
this.$refs.noticeRef.open("center");
let _this = this
setTimeout(() => {
_this.$refs.noticeRef.close();
}, 8000)
} else {
this.showPoster = false;
}
// 高速头条播报
this.handleGetHighwayHeadlines();
// 促销单品
@ -556,6 +573,7 @@ export default {
// 商城的内容
this.handleGetShoppingMall();
// this.handleAes()
this.$utils.addUserBehaviorNew();
},
@ -645,6 +663,88 @@ export default {
};
},
methods: {
// 拿到广告数据
async handleGetAdvertisementData() {
let minReq = {
ADDTIME: "2025-01-03T10:51:04",
APPGUID: "2693711a-72eb-48dc-b3dc-5122424e8fd4",
APPNAME: "",
INTERFACE_ADDRESS: "",
OPERATE_DATE: "2025-01-07T09:44:04",
OWNERUNIT_ID: 911,
OWNERUNIT_NAME: "云南交投集团经营开发有限公司彩云驿商业管理分公司",
PROVINCE_CODE: null,
STAFF_ID: 1,
STAFF_NAME: "系统开发者",
WECHATAPPSIGN_CODE: "",
WECHATAPPSIGN_DESC: "",
WECHATAPPSIGN_ID: 38,
WECHATAPPSIGN_NAME: "彩云驿商城",
WECHATAPP_APPID: "wxee018fb96955552a",
WECHATAPP_APPSECRET: "4d7f57d88b38b593781b4b0fd9e1a323",
WECHATPUBLICSIGN_ID: 3,
}
// let req = {
// WECHATAPPSIGN_ID: minReq.WECHATAPPSIGN_ID,
// WECHATAPP_APPID: minReq.WECHATAPP_APPID,
// USERDEFINEDTYPE_NAME: "小程序海报",
// PRESALE_STARTTIME: "2025-06-26 00:00:00",
// PRESALE_ENDTIME: "2025-07-02 23:59:59",
// GOODSTYPE: "7000",
// USERDEFINEDTYPE_STATE: 1,
// USERDEFINEDTYPE_ICO: "https://eshangtech.com/minTestImg/banner_0626_0702.png",
// OWNERUNIT_ID: 911,
// PROVINCE_CODE: "530000",
// STAFF_ID: 2785,
// type: 'encryption'
// }
// const data = await this.$api.$zzyLocalPost(
// "/MallBasic/SynchroUSERDEFINEDTYPE",
// req
// );
// console.log('datadatadatadatadatadatadatadatadata', data);
let req = {
SearchParameter: {
OWNERUNIT_ID: 911,
GOODSTYPE: 7000
},
SortStr: "OPERATE_DATE desc",
type: 'encryption'
}
const data1 = await this.$api.$zzyLocalPost(
"/MallBasic/GetUSERDEFINEDTYPEList",
req
);
let req2 = {
SearchParameter: {
OWNERUNIT_ID: 911,
GOODSTYPE: 7001
},
SortStr: "OPERATE_DATE desc",
type: 'encryption'
}
const data2 = await this.$api.$zzyLocalPost(
"/MallBasic/GetUSERDEFINEDTYPEList",
req2
);
console.log('datadatadatadatadatadatadatadatadata', data1);
console.log('datadatadatadatadatadatadatadatadata', data2);
let res1 = data1.Result_Data.List
let res2 = data2.Result_Data.List
this.swiperList.unshift(res1[0].USERDEFINEDTYPE_ICO)
this.poster = res2[0]
},
// 测试加密的方法
async handleAes() {
const req = {
@ -1854,6 +1954,15 @@ export default {
}
}
.nearbyScenic {
width: 100%;
box-sizing: border-box;
padding: 24rpx 20rpx;
margin-top: 18rpx;
background: #FFFFFF;
border-radius: 16rpx;
}
.roadStatus {
width: 100%;
margin-top: 40rpx;
@ -2216,7 +2325,8 @@ export default {
// background-image: url(https://ahyd.eshangtech.com/UploadImageDir/minprogram/caiyunyiguanggao_0529_0605.jpg);
// background-image: url(https://eshangtech.com/minTestImg/caiyunyiguanggao_0605_0612.jpg);
// background-image: url(https://eshangtech.com/minTestImg/caiyunyiguanggao_0612_0619.jpg);
background-image: url(https://eshangtech.com/minTestImg/caiyunyiguanggao_0619_0625.png);
// background-image: url(https://eshangtech.com/minTestImg/caiyunyiguanggao_0619_0625.png);
// background-image: url(https://eshangtech.com/minTestImg/caiyunyiguanggao_0626_0702.png);
background-repeat: no-repeat;
background-size: 100% 100%;
box-sizing: border-box;

159
pages/newEvaluate/index.vue
View File

@ -3,56 +3,34 @@
<div class="content">
<div class="contentTop">
<span class="title">您对商家/菜品满意吗？</span>
<checkbox
class="anonymous"
:checked="saveMsg.isAnonymous"
color="#CAA97F"
@change="isAnonymous($event, saveMsg)"
>
<radio class="anonymous" :checked="saveMsg.isAnonymous" color="#CAA97F" @click="isAnonymous($event, saveMsg)">
<text>匿名评价</text>
</checkbox>
</radio>
</div>
<div class="starRate">
<image
class="shopImg"
mode="aspectFit"
lazy-load="true"
:src="
saveMsg.merchantsId
? storeMsg.MERCHANTS_LOGO ||
'https://eshangtech.com/ShopICO/no-picture.png'
: storeMsg.MERCHANTS_LOGO ||
'https://eshangtech.com/ShopICO/no-picture.png'
"
/>
<image class="shopImg" mode="aspectFit" lazy-load="true" :src="saveMsg.merchantsId
? storeMsg.MERCHANTS_LOGO ||
'https://eshangtech.com/ShopICO/no-picture.png'
: storeMsg.MERCHANTS_LOGO ||
'https://eshangtech.com/ShopICO/no-picture.png'
" />
<div class="rateBox">
<div class="shopName">
{{
saveMsg.merchantsId
? storeMsg.MERCHANTS_EN || "-"
? storeMsg.MERCHANTS_NAME || "-"
: proMsg.COMMODITY_NAME || "-"
}}
</div>
<uni-rate
:size="24"
allowHalf
v-model="saveMsg.commentScore"
@change="changeRate($event, saveMsg)"
/>
<uni-rate :size="24" allowHalf v-model="saveMsg.commentScore" @change="changeRate($event, saveMsg)" />
</div>
</div>
<div class="textBox">
<textarea
cols="30"
rows="5"
:placeholder="
saveMsg.merchantsId
? '说说这家店的口味、环境、服务'
: '商品满足你的期待吗？说说你的使用心得，分享给想买的他们吧'
"
v-model="saveMsg.commentContent"
></textarea>
<textarea cols="30" rows="5" :placeholder="saveMsg.merchantsId
? '说说这家店的口味、环境、服务'
: '商品满足你的期待吗？说说你的使用心得，分享给想买的他们吧'
" v-model="saveMsg.commentContent"></textarea>
<view class="tip-text"> 评价文字不可少于3字 </view>
<view class="photo-box">
@ -72,97 +50,6 @@
<div class="submitBox">
<div class="submit" @click="postRate">提交</div>
</div>
<view class="card" v-if="false">
<view class="store-title">
<view v-if="saveMsg.merchantsId">
<image
mode="aspectFit"
lazy-load="true"
:src="
storeMsg.MERCHANTS_LOGO ||
'https://eshangtech.com/ShopICO/no-picture.png'
"
></image>
<text class="name">{{ storeMsg.MERCHANTS_EN }}</text>
</view>
<view v-else>
<image
mode="aspectFit"
lazy-load="true"
:src="
proMsg.IMAGE_PATH ||
'https://eshangtech.com/ShopICO/no-picture.png'
"
></image>
<text class="name-commodity">{{ proMsg.COMMODITY_NAME }}</text>
</view>
<!-- uni-app 不自带 Vant 组件，可以用替代方案 -->
<checkbox
:checked="saveMsg.isAnonymous"
color="#CAA97F"
@change="isAnonymous($event, saveMsg)"
>
<text style="font-size: 26rpx">匿名评价</text>
</checkbox>
</view>
<view class="star-box">
<!-- 替换 van-rate 可以使用自定义评分组件 -->
<uni-rate
:size="32"
allowHalf
v-model="saveMsg.commentScore"
@change="changeRate($event, saveMsg)"
/>
<!-- <uni-rate
:value="saveMsg.commentScore"
size="32"
allowHalf
:color="starColor"
@change="changeRate($event, saveMsg)"
/>
<view class="rate-text" :style="{ color: starColor }">{{
rateText
}}</view> -->
</view>
<view class="evaluate-box">
<textarea
cols="30"
rows="5"
:placeholder="
saveMsg.merchantsId
? '说说这家店的口味、环境、服务'
: '商品满足你的期待吗？说说你的使用心得，分享给想买的他们吧'
"
v-model="saveMsg.commentContent"
></textarea>
<view class="photo-box">
<view class="images" v-for="(item, i) in imgsList" :key="i">
<image mode="aspectFit" :src="item" @click="seePhoto(item)"></image>
<i @click="deleteImg(i)"></i>
</view>
<view class="add-photo" @click="choeseImg">
<i></i>
上传照片
</view>
</view>
<view class="tip-text"> 评价文字不可少于3字 </view>
</view>
</view>
<view
v-if="false"
class="post-btn"
:class="{ active: saveMsg.commentContent.length > 2 && noPost }"
@click="postRate"
>
提交
</view>
</view>
</template>
@ -206,7 +93,10 @@ export default {
},
methods: {
isAnonymous(event, item) {
item.isAnonymous = event.mp.detail;
console.log('eventevent', event);
// item.isAnonymous = event.mp.detail;
item.isAnonymous = !item.isAnonymous;
},
changeRate(event, item) {
this.saveMsg.commentScore = event.value;
@ -342,6 +232,10 @@ export default {
title: "正在提交...",
mask: true,
});
console.log('data', data);
return
this.$api.postCoop(data).then(function (rs) {
uni.hideLoading();
_this.noPost = true;
@ -377,6 +271,7 @@ export default {
})
.then(function (res) {
let _data = res.Data;
console.log('_data_data_data_data', _data);
_this.storeMsg = _data;
});
@ -440,17 +335,20 @@ export default {
background: #f5f6f7;
box-sizing: border-box;
padding: 16rpx 32rpx;
.content {
background: #ffffff;
border-radius: 6rpx;
width: 100%;
box-sizing: border-box;
padding: 32rpx;
.contentTop {
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
.title {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
@ -460,6 +358,7 @@ export default {
text-align: left;
font-style: normal;
}
.anonymous {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
@ -477,6 +376,7 @@ export default {
align-items: center;
padding-bottom: 32rpx;
border-bottom: 2rpx solid #f0f0f0;
.shopImg {
width: 104rpx;
height: 104rpx;
@ -484,6 +384,7 @@ export default {
overflow: hidden;
margin-right: 24rpx;
}
.rateBox {
.shopName {
font-family: PingFangSC, PingFang SC;
@ -499,6 +400,7 @@ export default {
.textBox {
margin-top: 24px;
.photo-box {
display: flex;
align-items: center;
@ -590,6 +492,7 @@ export default {
box-sizing: border-box;
bottom: 0;
left: 0;
.submit {
width: 100%;
font-family: PingFangSC, PingFang SC;

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

@ -27,38 +27,20 @@
</div> -->
<div class="tabs" v-if="searchType !== '6'">
<div
class="tabs_item"
:class="currentTab === item.value ? 'tab_active' : ''"
v-for="(item, idx) in tabList"
:key="idx"
@click="handleTab(item.value)"
>
<div class="tabs_item" :class="currentTab === item.value ? 'tab_active' : ''" v-for="(item, idx) in tabList"
:key="idx" @click="handleTab(item.value)">
{{ item.label }}
</div>
</div>
<div class="sum_count" v-if="TotalCount > 0">
共<span>{{ TotalCount }}</span
>笔订单, 合计<span>{{ TotalAmount }}</span
>元
共<span>{{ TotalCount }}</span>笔订单, 合计<span>{{ TotalAmount }}</span>元
</div>
</div>
<scroll-view
v-if="orderList && orderList.length > 0"
class="srcollView"
scroll-y="true"
refresher-enabled="true"
@refresherrefresh="handleRefresherrefresh"
:refresher-triggered="triggered"
@scrolltolower="handleScrollTolower"
>
<div
@click="goEvaluate(item)"
v-for="(item, idx) in orderList"
:key="idx"
>
<scroll-view v-if="orderList && orderList.length > 0" class="srcollView" scroll-y="true" refresher-enabled="true"
@refresherrefresh="handleRefresherrefresh" :refresher-triggered="triggered" @scrolltolower="handleScrollTolower">
<div @click="goEvaluate(item)" v-for="(item, idx) in orderList" :key="idx">
<OrderItem :obj="item" @handleGetOrderList="handleGetTypeOrderList" />
</div>
<view class="inBottom">
@ -127,16 +109,16 @@ export default {
console.log("this.currentTab", this.currentTab);
let type =
this.currentTab === 1
? ""
? "1010,2010,3000,8000,8010,8020,8900,8999,9000,9999"
: this.currentTab === 2
? "1005"
: this.currentTab === 3
? "1010,2000"
: this.currentTab === 4
? "2010"
: this.currentTab === 5
? ""
: "";
? "1005"
: this.currentTab === 3
? "1010,2000"
: this.currentTab === 4
? "2010"
: this.currentTab === 5
? ""
: "";
// 获取订单数据
this.handleGetOrderList(type);
@ -148,16 +130,16 @@ export default {
this.pageMsg.pageIndex = this.pageMsg.pageIndex + 1;
let type =
this.currentTab === 1
? ""
? "1010,2010,3000,8000,8010,8020,8900,8999,9000,9999"
: this.currentTab === 2
? "1005"
: this.currentTab === 3
? "1010,2000"
: this.currentTab === 4
? "2010"
: this.currentTab === 5
? ""
: "";
? "1005"
: this.currentTab === 3
? "1010,2000"
: this.currentTab === 4
? "2010"
: this.currentTab === 5
? ""
: "";
this.handleGetOrderList(type);
},
handleTab(val) {
@ -171,16 +153,16 @@ export default {
this.orderList = [];
let type =
val === 1
? ""
? "1010,2010,3000,8000,8010,8020,8900,8999,9000,9999"
: val === 2
? "1005"
: val === 3
? "1010,2000"
: val === 4
? "2010"
: val === 5
? ""
: "";
? "1005"
: val === 3
? "1010,2000"
: val === 4
? "2010"
: val === 5
? ""
: "";
this.handleGetOrderList(type);
},
// 下拉刷新的方法
@ -194,16 +176,16 @@ export default {
this.triggered = true;
let type =
this.currentTab === 1
? ""
? "1010,2010,3000,8000,8010,8020,8900,8999,9000,9999"
: this.currentTab === 2
? "1005"
: this.currentTab === 3
? "1010,2000"
: this.currentTab === 4
? "2010"
: this.currentTab === 5
? ""
: "";
? "1005"
: this.currentTab === 3
? "1010,2000"
: this.currentTab === 4
? "2010"
: this.currentTab === 5
? ""
: "";
await this.handleGetOrderList(type);
this.triggered = false;
},
@ -211,16 +193,16 @@ export default {
async handleGetTypeOrderList() {
let type =
this.currentTab === 1
? ""
? "1010,2010,3000,8000,8010,8020,8900,8999,9000,9999"
: this.currentTab === 2
? "1005"
: this.currentTab === 3
? "1010,2000"
: this.currentTab === 4
? "2010"
: this.currentTab === 5
? ""
: "";
? "1005"
: this.currentTab === 3
? "1010,2000"
: this.currentTab === 4
? "2010"
: this.currentTab === 5
? ""
: "";
await this.handleGetOrderList(type);
},
// 获取订单数据
@ -241,8 +223,8 @@ export default {
? 3001
: 3999
: this.pageType === "UnionMall"
? 3001
: "3000,3002",
? 3001
: "3000,3002",
salebillState: this.searchType === "6" ? "" : status || "",
PageIndex: this.pageMsg.pageIndex,
pageSize: this.pageMsg.pageSize,
@ -408,11 +390,13 @@ export default {
.srcollView {
width: 100%;
height: calc(100vh - 160rpx);
.inBottom {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
.bottomText {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
@ -424,6 +408,7 @@ export default {
position: relative;
padding: 6rpx 0;
}
.bottomText::after {
content: "";
width: 30vw;
@ -433,6 +418,7 @@ export default {
left: -32vw;
top: 50%;
}
.bottomText::before {
content: "";
width: 30vw;

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

@ -29,7 +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)">
<div class="continu-btn" @click="goPayment(orderInfo, orderInfo.TOTAL_PAY)">
去付款 <span>{{ minutes }}</span>
</div>
</block>
@ -299,7 +299,7 @@ export default {
this.getOrderInfo();
}
},
async goPayment(obj) {
async goPayment(obj, payMoney) {
// this.$refs.payPopup.open("bottom");
// 判断用户是否可余额支付
// if (
@ -328,7 +328,9 @@ export default {
notify_url:
"https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
amount: {
total: Number(_this.couponOrder) * 100 || 1,
total: payMoney
? payMoney * 100
: Number(_this.tatalMoney) * 100 || 1,
currency: "CNY",
}, // 订单金额
payer: {
@ -395,7 +397,9 @@ export default {
package: `prepay_id=${res.data.prepay_id}`,
signType: "RSA",
paySign: paySign,
total_fee: Number(_this.couponOrder) * 100 || 1,
total_fee: payMoney
? payMoney * 100
: Number(_this.tatalMoney) * 100 || 1,
success(res) {
console.log("res", res);
},
@ -404,7 +408,7 @@ export default {
},
complete(res) {
uni.redirectTo({
url: `/pages/order/orderdetail/index?orderInternal=${obj.SALEBILL_ID}`,
url: `/pages/order/orderFoodDetail/index?orderInternal=${obj.SALEBILL_ID}`,
});
},
});
@ -493,7 +497,7 @@ export default {
_this.$store.commit("couponPrice", "");
uni.redirectTo({
url:
"/pages/orders/orderdetail/main?orderNumber=" +
"/pages/orders/orderFoodDetail/main?orderNumber=" +
_this.orderNumber +
"&orderInternal=" +
_this.orderInternal,
@ -620,7 +624,7 @@ export default {
uni.redirectTo({
url:
"/pages/orders/orderdetail/main?orderNumber=" +
"/pages/orders/orderFoodDetail/main?orderNumber=" +
_this.orderNumber +
"&orderInternal=" +
_this.orderInternal,

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

@ -6,66 +6,53 @@
orderInfo.SALEBILL_STATE === 1010
? "待发货"
: orderInfo.SALEBILL_STATE === 2010
? "待收货"
: orderInfo.SALEBILL_STATE === 3000
? "已收货"
: orderInfo.SALEBILL_STATE === 8000
? "退款申请中"
: orderInfo.SALEBILL_STATE === 8010
? "商品退货中"
: orderInfo.SALEBILL_STATE === 8020
? "退款处理中"
: orderInfo.SALEBILL_STATE === 8900
? "订单已退款"
: orderInfo.SALEBILL_STATE === 8999
? "退款已关闭"
: orderInfo.SALEBILL_STATE === 9000
? "订单已关闭"
: orderInfo.SALEBILL_STATE === 9999
? "订单已撤销"
: ""
? "待收货"
: orderInfo.SALEBILL_STATE === 3000
? "已收货"
: orderInfo.SALEBILL_STATE === 8000
? "退款申请中"
: orderInfo.SALEBILL_STATE === 8010
? "商品退货中"
: orderInfo.SALEBILL_STATE === 8020
? "退款处理中"
: orderInfo.SALEBILL_STATE === 8900
? "订单已退款"
: orderInfo.SALEBILL_STATE === 8999
? "退款已关闭"
: orderInfo.SALEBILL_STATE === 9000
? "订单已关闭"
: orderInfo.SALEBILL_STATE === 9999
? "订单已撤销"
: ""
}}
</div>
<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, orderInfo.TOTAL_PAY)">
去付款 <span>{{ minutes }}</span>
</div>
</block>
<block
v-if="
orderInfo.SALEBILL_STATE !== 1005 &&
orderInfo.SALEBILL_STATE !== 2010 &&
orderInfo.SALEBILL_STATE !== 3000 &&
orderInfo.SALEBILL_STATE !== 8000 &&
orderInfo.SALEBILL_STATE !== 8010 &&
orderInfo.SALEBILL_STATE !== 8020 &&
orderInfo.SALEBILL_STATE !== 8900 &&
orderInfo.SALEBILL_STATE !== 8999 &&
orderInfo.SALEBILL_STATE !== 9000 &&
orderInfo.SALEBILL_STATE !== 9999 &&
orderInfo.COMMENT_STATE === 0
"
>
<block v-if="
orderInfo.SALEBILL_STATE !== 1005 &&
orderInfo.SALEBILL_STATE !== 2010 &&
orderInfo.SALEBILL_STATE !== 3000 &&
orderInfo.SALEBILL_STATE !== 8000 &&
orderInfo.SALEBILL_STATE !== 8010 &&
orderInfo.SALEBILL_STATE !== 8020 &&
orderInfo.SALEBILL_STATE !== 8900 &&
orderInfo.SALEBILL_STATE !== 8999 &&
orderInfo.SALEBILL_STATE !== 9000 &&
orderInfo.SALEBILL_STATE !== 9999 &&
orderInfo.COMMENT_STATE === 0
">
<!-- orderInfo.SALEBILL_STATE !== 1005 &&
orderInfo.SALEBILL_STATE !== 1010 && -->
<div
class="continu-btn"
@click="handleRefund"
v-if="orderInfo.SALEBILL_STATE === 1010"
>
<div class="continu-btn" @click="handleRefund" v-if="orderInfo.SALEBILL_STATE === 1010">
发起退款
</div>
<!-- <div class="back-btn" @click="goShop" v-if="orderInfo.SALEBILL_STATE!=1010">再来一单</div> -->
<div
class="continu-btn"
@click="goEvaluate"
v-if="orderInfo.SALEBILL_STATE >= 3000"
>
<div class="continu-btn" @click="goEvaluate" v-if="orderInfo.SALEBILL_STATE >= 3000">
评价得积分
</div>
</block>
@ -86,55 +73,43 @@
}}</span>
</p>
<p class="order-info-type">
<span class="order-info-t">收货方式</span
><span>{{
<span class="order-info-t">收货方式</span><span>{{
orderInfo.TAKE_TYPE === 1000
? "自提"
: orderInfo.TAKE_TYPE === 2000
? "邮寄"
: orderInfo.TAKE_TYPE === 3000
? "免发货"
: ""
? "邮寄"
: orderInfo.TAKE_TYPE === 3000
? "免发货"
: ""
}}</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 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>
<span class="order-info-t">订单编号</span><span>{{ orderInfo.SALEBILL_CODE }}</span>
</p>
<p class="order-info-type">
<span class="order-info-t">下单时间</span
><span>{{ orderInfo.ORDER_DATE }}</span>
<span class="order-info-t">下单时间</span><span>{{ orderInfo.ORDER_DATE }}</span>
</p>
<block v-if="orderInfo.TAKE_TYPE === 2000">
<p class="order-info-type">
<span class="order-info-t">下单人员</span
><span>{{ orderInfo.ORDER_PERSON }}</span>
<span class="order-info-t">下单人员</span><span>{{ orderInfo.ORDER_PERSON }}</span>
</p>
<p class="order-info-type" v-if="orderInfo.RESERVATION_DATE">
<span class="order-info-t">预约时间</span
><span>{{ orderInfo.RESERVATION_DATE }}</span>
<span class="order-info-t">预约时间</span><span>{{ orderInfo.RESERVATION_DATE }}</span>
</p>
<p class="order-info-type">
<span class="order-info-t">预约电话</span
><span>{{ orderInfo.ORDER_PERSONTEL }}</span>
<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>
<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>
<span class="order-info-t">微信支付</span><span>￥{{ orderInfo.TOTAL_PAY }}</span>
</p>
</block>
</div>
@ -142,15 +117,12 @@
<div class="order-box">
<div class="order-top" @click="goShop">
<div style="display: flex; align-items: center">
<img
src="https://eshangtech.com/ShopICO/shop_ico.png"
style="
<img src="https://eshangtech.com/ShopICO/shop_ico.png" style="
width: 56rpx;
height: 36rpx;
vertical-align: middle;
margin-right: 10rpx;
"
/>
" />
<span class="order-addr">{{ ShopAddress }}</span>
</div>
<van-icon name="arrow" size="30rpx" v-if="pageMsg.type === 0" />
@ -180,12 +152,7 @@
</div>
<div class="price-sum">
<div class="link-store" @click="callPhone">
<van-icon
name="phone-circle-o"
size="40rpx"
color="#CAA97F"
custom-style="margin-right:16rpx;"
></van-icon>
<van-icon name="phone-circle-o" size="40rpx" color="#CAA97F" custom-style="margin-right:16rpx;"></van-icon>
联系商家
</div>
<div class="">
@ -201,42 +168,23 @@
<div class="payList">
<radio-group :value="payType" class="radio-group">
<div
class="bottom-radio"
color="#CAA97F"
@click="handleChangePayType(1)"
>
<div class="bottom-radio" color="#CAA97F" @click="handleChangePayType(1)">
<div class="radioLeft">
<div class="logoBox">
<image
class="logoIcon"
src="/static/images/home/alipayIcon.png"
/>
<image class="logoIcon" src="/static/images/home/alipayIcon.png" />
</div>
<text>支付宝支付</text>
</div>
<radio
value="支付宝支付"
color="#CAA97F"
:checked="payType === 1"
/>
<radio value="支付宝支付" color="#CAA97F" :checked="payType === 1" />
</div>
<div
class="bottom-radio"
color="#CAA97F"
@click="handleChangePayType(2)"
>
<div class="bottom-radio" color="#CAA97F" @click="handleChangePayType(2)">
<div class="radioLeft">
<div class="logoBox">
<image class="logoIcon" src="/static/images/home/wxPay.png" />
</div>
<text>微信支付</text>
</div>
<radio
value="微信支付"
color="#CAA97F"
:checked="payType === 2"
/>
<radio value="微信支付" color="#CAA97F" :checked="payType === 2" />
</div>
</radio-group>
</div>
@ -307,7 +255,7 @@ export default {
content: "仅支持整单退款，确认发起退款申请？",
success: async function (res) {
if (res.confirm) {
console.log('_this.orderInfo_this.orderInfo_this.orderInfo_this.orderInfo',_this.orderInfo)
console.log('_this.orderInfo_this.orderInfo_this.orderInfo_this.orderInfo', _this.orderInfo)
uni.navigateTo({
url: `/pages/order/orderdetail/reasonforRefund?salebillId=${_this.orderInfo.SALEBILL_ID}&&saleBillChildId=${_this.orderInfo.SALEBILL_CHILD_ID || ""}`,
});
@ -428,6 +376,9 @@ export default {
// let out_trade_no = this.generateOutTradeNo(32)
let out_trade_no = obj.SALEBILL_CODE;
console.log("obj", obj);
console.log("payMoney", payMoney
? payMoney * 100
: Number(_this.tatalMoney) * 100 || 1);
let req = {
appid: "wxee018fb96955552a", // 公众账号ID
mchid: "1672298991", // 商户号
@ -459,12 +410,12 @@ export default {
};
console.log(
"POST\n/v3/pay/transactions/jsapi\n" +
timeStamp +
"\n" +
nonceStr +
"\n" +
JSON.stringify(req) +
"\n"
timeStamp +
"\n" +
nonceStr +
"\n" +
JSON.stringify(req) +
"\n"
);
const data = await this.$api.$get("/WeChat/GenerateSign", reqSign);
@ -671,21 +622,21 @@ export default {
title: "取消订单成功",
icon: "none",
duration: 2000,
success: function () {},
success: function () { },
});
uni.navigateBack({ delta: 1 });
} else {
uni.showModal({
title: "提示",
content: `${pingnuoData.data.description}`,
success: function (res) {},
success: function (res) { },
});
}
} else {
uni.showModal({
title: "提示",
content: `${pingnuoOrderDetail.data.description}`,
success: function (res) {},
success: function (res) { },
});
}
} else {
@ -693,7 +644,7 @@ export default {
title: "取消订单成功",
icon: "none",
duration: 2000,
success: function () {},
success: function () { },
});
uni.navigateBack({ delta: 1 });
}
@ -801,7 +752,7 @@ export default {
// })
}
},
complete(res) {},
complete(res) { },
});
} else {
uni.showToast({
@ -1043,6 +994,7 @@ page {
box-sizing: border-box;
// box-shadow 0 2rpx 16rpx 0.4rpx #e2e2e2
}
.pageDesc {
width: 100%;
text-align: left;
@ -1226,7 +1178,7 @@ hr {
justify-content: space-between;
}
.order-info-type + .order-info-type {
.order-info-type+.order-info-type {
border-top: 1px solid #f5f5f5;
}

66
pages/register/index.vue
View File

@ -217,43 +217,43 @@ export default {
let user = _this.user;
let res = e.mp.detail;
if (e.mp.detail) {
// uni.getUserInfo({
// success (res) {
console.log("user", this.user);
let arr = {
action_type: "WeChatAuthorize",
encryptedData: encodeURIComponent(res.encryptedData),
sessionKey: encodeURIComponent(user.session_key),
iv: encodeURIComponent(res.iv),
recommendId: _this.InviteCode,
requestType: "application/x-www-form-urlencoded",
// appId:"wx6a8173c6299c7a93"
};
uni.getUserInfo({
success(res) {
console.log("user", this.user);
let arr = {
action_type: "WeChatAuthorize",
encryptedData: encodeURIComponent(res.encryptedData),
sessionKey: encodeURIComponent(user.session_key),
iv: encodeURIComponent(res.iv),
recommendId: _this.InviteCode,
requestType: "application/x-www-form-urlencoded",
// appId:"wx6a8173c6299c7a93"
};
console.log('arrarrarrarrarr', arr);
console.log('arrarrarrarrarr', arr);
_this.$api.postCoop(arr).then(function (rs) {
console.log('rsrsrsrsrsrs', rs);
_this.$api.postCoop(arr).then(function (rs) {
console.log('rsrsrsrsrsrs', rs);
rs = rs.Data;
user.USER_UNIONID = rs.USER_UNIONID;
user.WechatUserId = rs.WechatUserId;
user.MEMBERSHIP_ID = rs.MEMBERSHIP_ID;
user.INDUSTRY_MEMBERSHIP_ID = rs.INDUSTRY_MEMBERSHIP_ID;
user.MEMBERSHIP_NAME = rs.MEMBERSHIP_NAME;
user.MEMBERSHIP_MOBILEPHONE = rs.MEMBERSHIP_MOBILEPHONE;
user.ACCOUNT_BALANCE = rs.ACCOUNT_BALANCE;
user.MEMBERSHIP_POINT = rs.MEMBERSHIP_POINT;
user.MEMBERSHIP_TYPE = rs.MEMBERSHIP_TYPE;
_this.showCancel = false;
rs = rs.Data;
user.USER_UNIONID = rs.USER_UNIONID;
user.WechatUserId = rs.WechatUserId;
user.MEMBERSHIP_ID = rs.MEMBERSHIP_ID;
user.INDUSTRY_MEMBERSHIP_ID = rs.INDUSTRY_MEMBERSHIP_ID;
user.MEMBERSHIP_NAME = rs.MEMBERSHIP_NAME;
user.MEMBERSHIP_MOBILEPHONE = rs.MEMBERSHIP_MOBILEPHONE;
user.ACCOUNT_BALANCE = rs.ACCOUNT_BALANCE;
user.MEMBERSHIP_POINT = rs.MEMBERSHIP_POINT;
user.MEMBERSHIP_TYPE = rs.MEMBERSHIP_TYPE;
_this.showCancel = false;
console.log("rs", rs);
_this.setUser(user);
_this.setCanIUse(false);
_this.$forceUpdate();
});
// }
// })
console.log("rs", rs);
_this.setUser(user);
_this.setCanIUse(false);
_this.$forceUpdate();
});
}
})
}
},
},

10
pages/serviceDetail/index.vue
View File

@ -494,7 +494,7 @@
<view class="popularMerchants">
<view class="popularTitle">热门商家</view>
<template v-if="merchantList && merchantList.length > 0">
<div class="newShopUnit" v-for="(item, i) in merchantList" :key="i" @click="goShop(item)">
<div class="newShopUnit" v-for="(item, i) in merchantList" :key="i" @click="goBuy(item)">
<div>
<div class="shopItemTop">
<div class="shopImg">
@ -576,7 +576,7 @@
<view class="rightItem">
<view class="attractionsText">{{ item.SCENICAREA_NAME || "" }}</view>
<view class="rightItemBox">营业时间：<text class="timeText">{{ item.SCENICAREA_OPENHOURS || ""
}}</text>
}}</text>
</view>
<view class="descBox">{{ item.SCENICAREA_INFO || "" }}</view>
</view>
@ -886,7 +886,7 @@ export default {
// delta: 1,
// });
if (this.pageType === "driver") {
if (this.pageType === "driver" || this.pageType === "userInfo") {
uni.navigateBack({
delta: 1,
});
@ -936,12 +936,12 @@ export default {
if (this.user.MEMBERSHIP_MOBILEPHONE) {
let id = item.SERVERPARTSHOP_IDS.split(",")[0];
uni.navigateTo({
url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}`,
url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&monthlySales=${item.MONTHLYSALES || ""}&perCapita=${item.PERCAPITA || ""}`,
});
} else {
let id = item.SERVERPARTSHOP_IDS.split(",")[0];
uni.navigateTo({
url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}`,
url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&monthlySales=${item.MONTHLYSALES || ""}&perCapita=${item.PERCAPITA || ""}`,
});
this.isLogin = true;
}

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

@ -410,40 +410,77 @@
<!-- 甄选商品 -->
<div class="allShopList">
<template v-if="pageType !== 'UnionMall'">
<view class="allShopTitle">积分商城</view>
<view class="jfDescBox">
<image mode="widthFix" class="descImg" src="https://eshangtech.com/ShopICO/ahyd-mall/descImg.png" />
</view>
<!-- <scroll-view class="allTypeBox" scroll-x="true">
<div :class="selectProducts === item.UserdefinedType_Id
? 'typeItem selectTypeItem'
: 'typeItem'
" v-for="(item, index) in shopTypeList" :key="index" @click="handleChangeShopMallType(item)">
{{ item.UserdefinedType_Name }}
</div>
</scroll-view> -->
<!-- <scroll-view class="allShopListContent" scroll-y="true" @scrolltolower="handleToBottomproductsList">
<view class="buyShopItem" v-for="(item, index) in productsList" :key="index"
:style="{ marginRight: index % 2 === 0 ? '22rpx' : '' }">
<div class="shopImgContent">
<image class="shopImage" :src="item.IMAGE_PATH" />
<!-- 新积分商城样式 -->
<template v-if="pageType !== 'UnionMall' && productsList && productsList.length > 0">
<div class="advertisementSecond">
<div class="advertisementItem" @click="handleGoPointsMall" v-if="pageType !== 'UnionMall'">
<div class="advertisementItemContent">
<div class="contentTop">
<div class="title">
积分商城
<!-- <image class="titleImg" src="https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/today3st.png" /> -->
</div>
<div class="moreBox">
<text class="moreText">更多</text>
<image class="rightIcon" src="https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/rightArrow.png" />
</div>
</div>
<!-- <div class="shopDesc">精品优选</div> -->
<scroll-view class="shopItemList" scroll-x>
<div :style="{
width: productsList.length * 160 + 'rpx',
height: '100%',
whiteSpace: 'noWrap',
}">
<!-- @click="handleGoShop(item)"-->
<div class="shopItem" v-for="(item, index) in productsList" :key="index"
@click.stop="handleGoShopDetail(item)">
<div class="imgBox">
<image class="shopImg" :src="item.IMAGE_PATH || '/static/images/home/defultImg.png'
" />
</div>
<text class="shopImgText">¥{{ item.bigNumber || "" }}.{{
item.smallNumber || "00"
}}</text>
<!-- {{ item.bigNumber
}}<text class="shopSmallText">{{
item.smallNumber ? "." + item.smallNumber : ".00"
}}</text> -->
</div>
</div>
</scroll-view>
</div>
<div class="priceBox">
<div class="shopName">{{ item.COMMODITY_NAME }}</div>
<view class="retailPrice">¥{{ item.RETbigNumber || "" }}.{{
item.RETsmallNumber || "00"
}}</view>
<view class="nowPrice">
<text class="unit">¥</text>
<text class="price">{{ item.bigNumber || "" }}.{{
item.smallNumber || "00"
}}</text>
</div>
<!-- 精选品牌 -->
<div class="advertisementItemUnionMall" v-if="pageType === 'UnionMall'">
<div class="advertisementItemContent">
<div class="contentTopUnionMall">
<div class="title">精选品牌</div>
</div>
<view class="shopItemList">
<view class="shopItem" v-for="(item, index) in brandList" :key="index"
@click="handleSearchBrand(item)" :style="{ marginBottom: index <= 4 ? '16rpx' : '' }">
<image class="imgBox" :src="item.src" />
<text class="imgText">{{ item.label }}</text>
<!-- <view class="imgBox">{{ item.label }}</view> -->
</view>
</view>
</div>
</view>
</scroll-view> -->
</div>
</div>
</template>
<!-- 老积分商城样式 -->
<!-- <template v-if="pageType !== 'UnionMall'"> -->
<template v-if="false">
<view class="allShopTitle">积分商城</view>
<!-- <view class="jfDescBox">
<image mode="widthFix" class="descImg" src="https://eshangtech.com/ShopICO/ahyd-mall/descImg.png" />
</view> -->
<div class="allShopListContent">
<div class="buyShopItem" v-for="(item, index) in productsList" :key="index"
@click.stop="handleGoShopDetail(item)">
@ -1412,6 +1449,12 @@ export default {
}
console.log("今日推荐", this.todayOffersList);
},
// 跳转积分商城
handleGoPointsMall() {
uni.navigateTo({
url: `/pages/shopPages/shopList/index?pageType=pointsMall`,
});
},
// 切换甄选商品的类型
handleChangeShopMallType(obj) {
this.selectProducts = obj.UserdefinedType_Id;
@ -2501,6 +2544,8 @@ export default {
}
}
.allShopList {
width: 100%;
margin-top: 40rpx;
@ -2966,6 +3011,216 @@ export default {
top: 50%;
}
}
.advertisementSecond {
width: 100%;
margin-top: 24rpx;
display: flex;
justify-content: space-between;
.advertisementItem {
width: 100%;
//width: calc((100% - 26rpx) / 2);
height: 316rpx;
background: #fff;
border-radius: 14rpx;
box-sizing: border-box;
padding: 2rpx;
.advertisementItemContent {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 16rpx 22rpx;
background-image: url("https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/recommendation.png");
background-repeat: no-repeat;
background-size: 100% 100%;
.contentTop {
width: 100%;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
.title {
font-size: 14px;
font-weight: 600;
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;
}
}
}
.contentTopUnionMall {
width: 100%;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
.title {
font-size: 26rpx;
font-weight: 600;
color: #181716;
}
}
.shopDesc {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #8b8280;
line-height: 36rpx;
text-align: left;
font-style: normal;
}
.shopItemList {
width: 100%;
height: 95px;
margin-top: 24rpx;
.shopItem {
width: 136rpx;
display: inline-block;
margin-right: 24rpx;
.imgBox {
width: 136rpx;
height: 136rpx;
border-radius: 50%;
overflow: hidden;
.shopImg {
width: 100%;
height: 100%;
}
}
.shopImgText {
display: inline-block;
width: 100%;
font-family: DINAlternate, DINAlternate;
font-weight: bold;
font-size: 28rpx;
color: #fe3f22;
line-height: 32rpx;
text-align: center;
font-style: normal;
.shopSmallText {
font-size: 24rpx;
}
}
}
}
}
.advertisementItemContent ::-webkit-scrollbar {
display: none;
}
}
.advertisementItemUnionMall {
width: 100%;
background: #fff;
border-radius: 14rpx;
box-sizing: border-box;
padding: 2rpx;
.advertisementItemContent {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 16rpx 22rpx;
background: linear-gradient(rgba(255, 239, 238, 1) 0%,
rgba(255, 254, 254, 1) 100%) no-repeat;
background-size: 100% 176rpx;
// background-image: url("https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/recommendation.png");
// background-repeat: no-repeat;
// background-size: 100% 100%;
.contentTopUnionMall {
width: 100%;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
.title {
font-size: 26rpx;
font-weight: 600;
color: #181716;
}
}
.shopItemList {
width: 100%;
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
.shopItem {
width: 20%;
height: 166rpx;
overflow: hidden;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.imgBox {
width: 96rpx;
height: 96rpx;
display: flex;
align-items: center;
background-color: #f3f6f9;
border-radius: 50%;
justify-content: center;
font-size: 24rpx;
margin-bottom: 4rpx;
}
.imgText {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #130f05;
line-height: 36rpx;
text-align: left;
font-style: normal;
}
}
}
}
}
}
}
}

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

@ -2,19 +2,14 @@
<view class="main">
<div class="mainTop" :style="{ paddingTop: menu.top + 'px' }">
<view class="headerTop" :style="{ height: menu.height + 'px' }">
<image
class="backArrow"
src="/static/images/home/backArrowblack.svg"
@click="handleBackHome"
/>
<image class="backArrow" src="/static/images/home/backArrowblack.svg" @click="handleBackHome" />
<view class="pageName">{{
bigPageType === "UnionMall" ? "工会之家" : "购物车"
}}</view>
<view class="backArrow"></view>
</view>
<div
style="
<div style="
width: 100%;
height: 60px;
display: flex;
@ -22,8 +17,7 @@
justify-content: flex-end;
padding-top: 20px;
box-sizing: border-box;
"
>
">
<div class="topLeft" @click="handleShowAddress">
<view style="display: flex; align-items: center">
<image class="topIcon" src="/static/images/home/fixed.svg" />
@ -31,11 +25,7 @@
showAddressObj.DOORPLATE || "点击添加地址"
}}</text>
</view>
<view
class="phone"
style="margin-top: 8rpx"
v-if="showAddressObj.MEMBERADDRESS_ID"
>
<view class="phone" style="margin-top: 8rpx" v-if="showAddressObj.MEMBERADDRESS_ID">
<text style="margin-right: 8rpx">{{
showAddressObj.USER_NAME || ""
}}</text>
@ -48,11 +38,7 @@
</view>
</picker> -->
</div>
<div
v-if="pageType === 'normal'"
class="topRight"
@click="handleChangePageType"
>
<div v-if="pageType === 'normal'" class="topRight" @click="handleChangePageType">
<image class="editIcon" src="/static/images/home/edit.svg" />
<text class="editText">编辑</text>
</div>
@ -62,62 +48,32 @@
</div>
</div>
<scroll-view
class="shopList"
scroll-y
:style="{
height: `calc(100vh - ${
50 + safeHeight + 60 + menu.top + 32 + 80 + 16
<scroll-view class="shopList" scroll-y :style="{
height: `calc(100vh - ${50 + safeHeight + 60 + menu.top + 32 + 80 + 16
}px)`,
}"
>
}">
<div class="shopBox">
<div class="shopItem" v-for="(item, index) in shopList" :key="index">
<!-- :style="{ height: (item.rows - 1) * 28 + 210 + 'rpx' }" -->
<!-- @touchmove="moveTouch" -->
<view
class="shopUp"
:style="{ height: (item.rows - 1) * 28 + 210 + 'rpx' }"
>
<div
class="detail"
:style="
selectIndex === index
? selectStyle
: (item.rows - 1) * 28 + 210 + 'rpx'
"
@touchstart="startTouch($event, index)"
@touchmove="moveTouch"
@touchend="endTouch"
:key="index"
>
<view class="shopUp" :style="{ height: (item.rows - 1) * 28 + 210 + 'rpx' }">
<div class="detail" :style="selectIndex === index
? selectStyle
: (item.rows - 1) * 28 + 210 + 'rpx'
" @touchstart="startTouch($event, index)" @touchmove="moveTouch" @touchend="endTouch" :key="index">
<div class="detailLeft">
<view style="display: flex">
<radio
v-if="pageType === 'normal'"
:checked="item.select"
color="#1890FF"
@click="handleChangeSelect(item)"
></radio>
<radio
v-else
:checked="item.selectDelete"
color="#1890FF"
@click="handleChangeDelete(item)"
></radio>
<image
class="leftIcon"
:src="
item.IMAGE_PATH ||
item.DEFAULT_IMG ||
'/static/images/home/defultImg.png'
"
/>
<radio v-if="pageType === 'normal'" :checked="item.select" color="#1890FF"
@click="handleChangeSelect(item)"></radio>
<radio v-else :checked="item.selectDelete" color="#1890FF" @click="handleChangeDelete(item)"></radio>
<image class="leftIcon" :src="item.IMAGE_PATH ||
item.DEFAULT_IMG ||
'/static/images/home/defultImg.png'
" />
</view>
<view class="simPriceBox">
<text class="sumPriceUnit">￥</text
>{{
<text class="sumPriceUnit">￥</text>{{
$utils.handleFormatNumber(
item.COMMODITY_MEMBERPRICE * item.count
)
@ -129,6 +85,7 @@
<div class="pingnuo" v-if="item.DATAFORMAT === 2">
<div class="pingnuoItem">品诺</div>
</div>
{{ item.COMMODITY_RULE ? `（${item.COMMODITY_RULE}）` : "" }}
{{ item.COMMODITY_NAME }}
</div>
<div class="otherBox">
@ -142,59 +99,31 @@
</view>
</div>
<div class="cartcontrol">
<div
class="subtract"
@click="decreaseGoodToCartFn($event, item)"
:id="
'decrease_' +
item.SELLERCOMMODITY_ID +
'_' +
item.SELLERCOMMODITYTYPE_ID
"
>
<image
class="img"
src="/static/images/home/subtract.svg"
></image>
<div class="subtract" @click="decreaseGoodToCartFn($event, item)" :id="'decrease_' +
item.SELLERCOMMODITY_ID +
'_' +
item.SELLERCOMMODITYTYPE_ID
">
<image class="img" src="/static/images/home/subtract.svg"></image>
</div>
<!-- -->
<!-- confirm-type="search" @confirm="getList"-->
<input
class="cart-count"
confirm-type="done"
type="digit"
:maxlength="7"
style="background: #fff; text-align: center"
placeholder="0"
@blur="haveFocus($event, item)"
@focus="haveFocus($event, item)"
v-model="item.count"
/>
<input class="cart-count" confirm-type="done" type="digit" :maxlength="7"
style="background: #fff; text-align: center" placeholder="0" @blur="haveFocus($event, item)"
@focus="haveFocus($event, item)" v-model="item.count" />
<!-- @change="changInput($event, item)"-->
<div
class="subtract"
@click="touchOnGoods($event, item)"
:id="
'add_' +
item.SELLERCOMMODITY_ID +
'_' +
item.SELLERCOMMODITYTYPE_ID
"
>
<image
class="img"
src="/static/images/home/addIcon.svg"
></image>
<div class="subtract" @click="touchOnGoods($event, item)" :id="'add_' +
item.SELLERCOMMODITY_ID +
'_' +
item.SELLERCOMMODITYTYPE_ID
">
<image class="img" src="/static/images/home/addIcon.svg"></image>
</div>
</div>
</div>
<!-- <div class="descBox">{{item.SALEDETAIL_DESC}}</div>-->
<div class="descBox">
<input
class="desc"
v-model="item.SALEDETAIL_DESC"
placeholder="请填写商品备注"
/>
<input class="desc" v-model="item.SALEDETAIL_DESC" placeholder="请填写商品备注" />
</div>
</div>
</div>
@ -206,18 +135,10 @@
<div class="bottom" :style="{ bottom: `${50 + safeHeight}px` }">
<div class="bottomLeft" v-if="pageType === 'normal'">
<radio
:checked="isAllSelect"
color="#1890FF"
@click="handleAllSelect"
/>全选
<radio :checked="isAllSelect" color="#1890FF" @click="handleAllSelect" />全选
</div>
<div class="bottomLeft" v-else>
<radio
:checked="isAllDelete"
color="#1890FF"
@click="handleAllDelete"
/>全选
<radio :checked="isAllDelete" color="#1890FF" @click="handleAllDelete" />全选
</div>
<div class="bottomRight" v-if="pageType === 'normal'">
<text class="sum">合计</text>
@ -232,32 +153,16 @@
<view class="addressPopupBox">
<view class="addressPopupTitle">选择收货地址</view>
<view class="addressList">
<view
class="addressItem"
v-for="(item, index) in addressList"
:key="index"
@click="handleClickAddressItem(item)"
>
<view class="addressItem" v-for="(item, index) in addressList" :key="index"
@click="handleClickAddressItem(item)">
<view class="addressItemTop">
<view class="itemTopLeft">
<radio
: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
>
<radio :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>
</view>
<view
class="itemTopRight"
@click="checkOrEdit(item.MEMBERADDRESS_ID)"
>
<img
class="pickerImg"
src="https://eshangtech.com/ShopICO/ahyd-mall/editIcon.svg"
/>
<view class="itemTopRight" @click="checkOrEdit(item.MEMBERADDRESS_ID)">
<img class="pickerImg" src="https://eshangtech.com/ShopICO/ahyd-mall/editIcon.svg" />
</view>
</view>
@ -273,18 +178,12 @@
</view>
</view>
<navigator url="/pages/myAddress/newAdd/index" class="btn"
>新增收货地址</navigator
>
<navigator url="/pages/myAddress/newAdd/index" class="btn">新增收货地址</navigator>
</view>
</uni-popup>
<shop-tabbar
:page="'/pages/shopMallPage/shopCar/index'"
:pageType="bigPageType"
:shopCarLength="shopCarListCount"
:zIndex="popupShow ? 98 : 99"
/>
<shop-tabbar :page="'/pages/shopMallPage/shopCar/index'" :pageType="bigPageType" :shopCarLength="shopCarListCount"
:zIndex="popupShow ? 98 : 99" />
</view>
</template>
@ -595,11 +494,20 @@ export default {
if (res.confirm) {
item.count -= 1;
// 这里重复了先这样
console.log('item', JSON.parse(JSON.stringify(item)));
if (item.count === 0) {
let list = [];
_this.shopList.forEach((i) => {
if (i.COMMODITY_CODE !== item.COMMODITY_CODE) {
list.push(i);
// 判断有没有多规格
if (item.RTCOMMODITY_MULTI_ID) {
if (i.RTCOMMODITY_MULTI_ID !== item.RTCOMMODITY_MULTI_ID) {
list.push(i);
}
} else {
if (i.COMMODITY_ID !== item.COMMODITY_ID) {
list.push(i);
}
}
});
_this.shopList = list;
@ -621,13 +529,22 @@ export default {
if (item.count === 0) {
let list = [];
this.shopList.forEach((i) => {
if (i.COMMODITY_CODE !== item.COMMODITY_CODE) {
list.push(i);
if (item.RTCOMMODITY_MULTI_ID) {
if (i.RTCOMMODITY_MULTI_ID !== item.RTCOMMODITY_MULTI_ID) {
list.push(i);
}
} else {
if (i.COMMODITY_ID !== item.COMMODITY_ID) {
list.push(i);
}
}
});
this.shopList = list;
}
this.handleSum();
console.log(' this.shopList', this.shopList);
if (this.bigPageType === "UnionMall") {
this.$store.commit("unionMyShopCar", this.shopList);
} else {
@ -708,21 +625,21 @@ export default {
},
// 左滑出现的删除
handleDeleteItem(obj) {
console.log('obj',obj)
console.log('this.shopList',this.shopList)
console.log('obj', obj)
console.log('this.shopList', this.shopList)
let list = [];
this.shopList.forEach((item) => {
if (item.COMMODITY_ID !== obj.COMMODITY_ID) {
list.push(item);
}else{
if(obj.RTCOMMODITY_MULTI_ID){
} else {
if (obj.RTCOMMODITY_MULTI_ID) {
// 规格都一样 说明确实是同一个了 可以删除
if(item.RTCOMMODITY_MULTI_ID === obj.RTCOMMODITY_MULTI_ID){
if (item.RTCOMMODITY_MULTI_ID === obj.RTCOMMODITY_MULTI_ID) {
}else{
} else {
list.push(item);
}
}else{
} else {
// list.push(item);
}
}
@ -1076,6 +993,7 @@ export default {
width: 100%;
margin-top: 24rpx;
text-align: center;
.sumPriceUnit {
font-size: 12px;
font-family: DINAlternate-Bold, DINAlternate;
@ -1106,17 +1024,17 @@ 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%
);
background: linear-gradient(90deg,
#ffebe5 0%,
#ffedd8 100%);
font-family: "PingFangSC";
font-weight: 400;
font-size: 22rpx;
@ -1138,6 +1056,7 @@ export default {
display: flex;
flex-direction: column;
align-items: flex-start;
.priceIcon {
font-size: 12px;
font-family: DINAlternate-Bold, DINAlternate;
@ -1171,6 +1090,7 @@ export default {
color: #ff6219;
line-height: 18px;
width: 100%;
.sumPriceUnit {
font-size: 12px;
font-family: DINAlternate-Bold, DINAlternate;

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

@ -24,9 +24,9 @@
<view class="userPhone">{{ phone || "" }}</view>
</view>
</view>
<view class="userRight">
<!-- <view class="userRight">
<image class="messageImg" src="/static/images/home/msg.svg" />
</view>
</view> -->
</view>
<view class="content">

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

@ -75,7 +75,7 @@
</label>
</radio-group>
<view class="repositioning" @click="handleAgainPosition" v-if="hideAgainIcon">
<view class="repositioning" @click="handleAgainPosition" v-if="hideAgainIcon && false">
<image class="icon" src="https://eshangtech.com/wanmeiyizhanImg/home/repositioning.svg" />
</view>
</div>
@ -103,7 +103,7 @@
</radio-group>
</div>
<div class="sellement-apponit-unit">
<div class="sellement-apponit-unit" v-if="active === 0">
<div class="time-title">是否打包</div>
<radio-group :value="isPackage" @change="onChangeIsPackage" class="radio-box bb1">
<view class="radio-list" v-for="(item, index) in packageList" :key="index">
@ -322,6 +322,7 @@ export default {
peopleStr: "", // 人数的具体
hideAgainIcon: true, // 是否显示重新定位
isLoading: false,
arriveTime: ""
};
},
components: {
@ -491,8 +492,11 @@ export default {
getTs() {
this.active = 1;
this.type = 1000;
this.isPackage = 1000
},
getRadio(item) {
console.log('itemitemitem', item);
// 就餐时间
// if (this.radio === item.value) {
// this.radio = ''
@ -516,15 +520,30 @@ export default {
this.phoneNumber = event.mp.detail.value;
},
bindTimeChange(event) {
this.showTime = event.mp.detail.value;
let stime1 = this.showTime.split(":");
let stime2 = this.startT.split(":");
let st1 =
60 * Number(stime1[1]) +
Number(stime1[0]) * 3600 -
(60 * Number(stime2[1]) + Number(stime2[0]) * 3600);
this.radio = this.showTime;
this.radioType = st1 / 60;
let index = Number(event.detail.value)
let time = timeList[index]
if (time.indexOf('次日') === -1) {
this.radio = time
this.showTime = time
} else {
let day = this.$moment.now().format("YYYY-MM-DD")
this.radio = `${day} ${time.split('次日')[1]}`
this.showTime = time
}
// console.log('eventeventevent', event);
// this.showTime = event.mp.detail.value;
// let stime1 = this.showTime.split(":");
// let stime2 = this.startT.split(":");
// let st1 =
// 60 * Number(stime1[1]) +
// Number(stime1[0]) * 3600 -
// (60 * Number(stime2[1]) + Number(stime2[0]) * 3600);
// this.radio = this.showTime;
// this.radioType = st1 / 60;
},
goCoupon() {
uni.navigateTo({
@ -575,7 +594,8 @@ export default {
tableNumber: _this.tableNum || "",
takeType: _this.type,
packType: _this.isPackage,
reservationDate: _this.type === 2000 ? _this.radio : "",
// reservationDate: _this.type === 2000 ? _this.radio : "",
reservationDate: _this.type === 2000 ? _this.arriveTime : "",
orderPersonTel: _this.phoneNumber ? _this.phoneNumber : "",
couponCode: _this.couponAmount ? _this.couponPrice.CouponCode : "",
t_saleorderdetail: JSON.stringify(_this.shopOrder),
@ -971,13 +991,29 @@ export default {
console.log("arriveTime", arriveTime);
if (arriveTime) {
let nowTime = Date.now();
let nowDay = new Date().getDate();
console.log("nowDay", nowDay);
let arriveDate = new Date(nowTime + arriveTime * 1000);
let y = arriveDate.getFullYear()
let m = arriveDate.getMonth() + 1
if (m < 10) {
m = '0' + m
}
let day = arriveDate.getDate();
let hour = arriveDate.getHours();
let min = arriveDate.getMinutes();
console.log("day", day);
console.log("hour", hour);
console.log("min", min);
_this.beExpectedTo = `${hour < 10 ? "0" + hour : hour}:${min < 10 ? "0" + min : min
this.arriveTime = `${y}-${m}-${day} ${hour}:${min}`
console.log('this.arriveTime', this.arriveTime);
_this.beExpectedTo = `${nowDay < day ? day - nowDay === 1 ? '次日' : `${day - nowDay}天后` : ''}${hour < 10 ? "0" + hour : hour}:${min < 10 ? "0" + min : min
}`;
}
},
@ -1200,6 +1236,7 @@ bodyColor = #CAA97F;
padding-right: 16rpx;
height: 96rpx;
line-height: 96rpx;
white-space: nowrap;
}
.custom-radio:checked::before {

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

@ -22,11 +22,11 @@
<span style="margin: 0 8rpx; color: #fff; font-size: 22rpx">|</span>
<span class="month">月售
<span class="value">{{
listDetail.MONTHLYSALES || merchatsMsg.MONTHLYSALES || 0
}}</span></span>
monthlySales || merchatsMsg.MONTHLYSALES || 0
}}</span></span>
<span style="margin: 0 8rpx; color: #fff; font-size: 22rpx">|</span>
<span class="month">人均<span class="value">￥{{
listDetail.PERCAPITA || merchatsMsg.PERCAPITA || "-"
perCapita || merchatsMsg.PERCAPITA || "-"
}}</span></span>
</div>
@ -64,7 +64,7 @@
{{ item.label }}
<span class="smallNumber" v-if="item.value === 2">{{
merchatsMsg.COMMENT_COUNT || ""
}}</span>
}}</span>
</div>
<!-- CAA97F -->
</div>
@ -389,6 +389,10 @@ export default {
{ label: "商家", value: 3 },
],
storeMsg: {},
onLoadMid: "",
onLoadType: "",
monthlySales: "",//月售
perCapita: '',// 人均
};
},
computed: {
@ -859,26 +863,27 @@ export default {
goDetail(item) {
uni.navigateTo({ url: "/pages/couponDetail/index?id=" + item.CouponId });
},
getShop(id, type) {
async getShop(id, type) {
let _this = this;
this.$api
.getCoop({
action_type: "GetMerchantsDetails",
merchantsId: id,
})
.then(function (res) {
let _data = res.Data;
console.log("_datagetShop", _data);
_this.merchatsMsg = _data;
_this.getCouponList(_data.MERCHANTS_ID); // 获取商家优惠
_this.getFoodImages(_data.MERCHANTS_ID); // 加载商家商品推荐
_this.getNewShop(type, _data.PROVINCE_CODE || "530000"); // 获取方向信息
setTimeout(function () {
if (_this.$refs.merchantEvaluation) {
_this.$refs.merchantEvaluation.loading();
}
}, 500);
});
let res = await this.$api.getCoop({
action_type: "GetMerchantsDetails",
merchantsId: id,
});
// .then(function (res) {
// });
let _data = res.Data;
console.log('32312312', _data);
_this.merchatsMsg = _data;
_this.getCouponList(_data.MERCHANTS_ID); // 获取商家优惠
_this.getFoodImages(_data.MERCHANTS_ID); // 加载商家商品推荐
_this.getNewShop(type, _data.PROVINCE_CODE); // 获取方向信息
setTimeout(function () {
if (_this.$refs.merchantEvaluation) {
_this.$refs.merchantEvaluation.loading();
}
}, 500);
},
getCouponList(id) {
let _this = this;
@ -886,6 +891,34 @@ export default {
.$get("/WeChat/GetCouponList", { sellerId: id })
.then(function (data) {
_this.couponList = data.Result_Data.List || [];
let tabList = [];
let isFood = false;
if (_this.couponList && _this.couponList.length > 0) {
// tabList.push({ label: "优惠", value: 4 });
// _this.tabList = [
// { label: "优惠", value: 4 },
// ,
// ];
}
if (_this.catList && _this.catList.length > 0) {
tabList.push({
label: _this.buyType === 1 ? "点餐" : "商品",
value: 1,
});
isFood = true;
}
tabList = tabList.concat([
{ label: "评价", value: 2 },
{ label: "商家", value: 3 },
]);
_this.tabList = tabList;
_this.activeTabs = isFood ? 1 : tabList[0].value;
console.log('_this.activeTabs_this.activeTabs', _this.activeTabs);
_this.$forceUpdate()
console.log("_this.couponList", _this.couponList);
});
},
@ -915,6 +948,8 @@ export default {
this.stroreId = options.id;
// this.merchatsMsg.MERCHANTS_ID = options.mid
this.getShop(options.mid, options.type || 0); // 获取商户信息
this.onLoadMid = options.mid;
this.onLoadType = options.type;
this.tableNum = options.tableNum || 0; // tableNum 桌号 不等于0说明是门店扫码进入 则当确认订单时 不要选择相关的方向
this.$store.commit("orderTable", options.tableNum || 0);
@ -929,6 +964,16 @@ export default {
} else {
this.goodsH = goodsHeight;
}
if (options.monthlySales) {
this.monthlySales = options.monthlySales
}
if (options.perCapita) {
this.perCapita = options.perCapita
}
this.$utils.addUserBehaviorNew();
},
onUnload() {
@ -958,11 +1003,13 @@ export default {
this.shopCart = [];
this.shoppingCateCount = {};
}
console.log('activeTabs', this.activeTabs);
if (this.activeTabs === 2) {
setTimeout(() => {
this.$refs.merchantEvaluation.loading();
});
this.getShop(this.onLoadMid, this.onLoadType || 0)
// setTimeout(() => {
// this.$refs.merchantEvaluation.loading();
// });
}
this.$forceUpdate();
},

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

@ -784,7 +784,7 @@ export default {
console.log("this.good", this.good);
console.log('this.shopCarList', this.shopCarList);
console.log('this.shopCarList', JSON.parse(JSON.stringify(this.shopCarList)));
// 当前购物车的数据
if (this.shopCarList && this.shopCarList.length > 0) {
let nowShopList = [];
@ -810,7 +810,7 @@ export default {
isSame = true;
} else {
// 同商品 但是不同规格的添加
list.push({ ...this.good });
// list.push({ ...this.good });
}
} else {
// 没有多规格 购物车中又已经有了该商品 那么就数量就加上这次添加到购物车的数量
@ -820,21 +820,22 @@ export default {
isSame = true;
} else {
// 当前购物车中找不到同样的商品 说明是新商品 那么直接添加到购物车中
list.push({ ...this.good });
// list.push({ ...this.good });
// isSame = false
}
}
});
nowShopList = list
// nowShopList = list
// 判断是否是一样的商品
// if (isSame) {
// // nowShopList = this.shopCarList;
// nowShopList = list
// } else {
// // this.shopCarList.push(this.good);
// // list.push(this.good);
// // nowShopList = this.shopCarList;
// nowShopList = list;
// }
if (isSame) {
// nowShopList = this.shopCarList;
nowShopList = JSON.parse(JSON.stringify(list));
} else {
// this.shopCarList.push(this.good);
list.push(this.good);
// nowShopList = this.shopCarList;
nowShopList = JSON.parse(JSON.stringify(list));
}
console.log('nowShopListnowShopListnowShopList', nowShopList);
this.shopCarList = nowShopList

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

@ -46,7 +46,7 @@
</view>
</view>
<view class="noDataBox" v-else>
<view class="noDataBox" v-if="shopList && shopList.length === 0">
<no-data text="暂无商品数据" />
</view>
</scroll-view>
@ -59,7 +59,7 @@ export default {
return {
menu: {},
pageTitle: "",
shopList: [],
shopList: null,
pageType: "",
selectType: "",
brandName: "", // 查询的品牌商品

187
pages/storeDetail/index.vue
View File

@ -5,15 +5,10 @@
<!-- style="background: linear-gradient(#c8b190, #a18153)" -->
<div class="store-img">
<image
mode="aspectFill"
:src="
storeMsg && storeMsg.MERCHANTS_LOGO
? storeMsg.MERCHANTS_LOGO
: 'https://eshangtech.com/ShopICO/no-picture.png'
"
@click="seeLogo(storeMsg.MERCHANTS_LOGO)"
></image>
<image mode="aspectFill" :src="storeMsg && storeMsg.MERCHANTS_LOGO
? storeMsg.MERCHANTS_LOGO
: 'https://eshangtech.com/ShopICO/no-picture.png'
" @click="seeLogo(storeMsg.MERCHANTS_LOGO)"></image>
</div>
<div class="stote-head">
@ -28,9 +23,9 @@
公告：欢迎光临
</div>
<div class="coupon-unit" style="margin-top: 8rpx">
评价{{ storeMsg.MERCHANTS_SCORE || "-" }}
1评价{{ monthlySales || storeMsg.MERCHANTS_SCORE || "-" }}
<span style="margin: 0 8rpx; color: #e3e3e3">|</span>
月售{{ storeMsg.MONTHLYSALES || 0 }}
月售{{ perCapita || storeMsg.MONTHLYSALES || 0 }}
<!-- <span v-show="storeMsg.ShopList && storeMsg.ShopList.length>0 && pageMsg.noAppoint==false" style="margin:0 8rpx;color:#E3E3E3;">|</span>
<span v-show="storeMsg.ShopList && storeMsg.ShopList.length>0 && pageMsg.noAppoint==false" @click="goShop" class="go-btn">去点餐</span>
-->
@ -39,20 +34,13 @@
</div>
<div class="tabContentBox">
<div class="tabBox">
<div
:class="
item.value === pageMsg.activeTabs
? 'tabItems selectTab'
: 'tabItems'
"
v-for="(item, index) in tabList"
:key="index"
@click="handleChangeTab(item.value)"
:style="{
<div :class="item.value === pageMsg.activeTabs
? 'tabItems selectTab'
: 'tabItems'
" v-for="(item, index) in tabList" :key="index" @click="handleChangeTab(item.value)" :style="{
display: item.value === 1 ? 'flex' : '',
alignItems: item.value === 1 ? 'center' : '',
}"
>
}">
{{ item.label || "" }}
<span class="smallNumber" v-if="item.value === 1">{{
storeMsg.COMMENT_COUNT || ""
@ -63,23 +51,15 @@
<div class="contentList">
<div v-if="pageMsg.activeTabs === 0">
<div style="padding: 32rpx 0">
<div
class="coupon-list"
v-for="(item, i) in couponList"
:key="i"
:class="{
'coupon-bg': isBgcolor && couponOrder <= item.WITH_AMOUNT,
}"
>
<div class="coupon-list" v-for="(item, i) in couponList" :key="i" :class="{
'coupon-bg': isBgcolor && couponOrder <= item.WITH_AMOUNT,
}">
<div class="itemleft">
<div>
<span class="leftUnit">¥</span>
<span class="money">{{ item.UseAmount }}</span>
</div>
<div
v-if="!item.CouponSendId && item.CouponPoint"
class="condition"
>
<div v-if="!item.CouponSendId && item.CouponPoint" class="condition">
{{ item.CouponPoint }}积分兑换
</div>
<div v-else class="condition">
@ -94,12 +74,8 @@
<div>
<div class="couponName">{{ item.CouponName }}</div>
<div class="timeText">
<span class="coupon-date" v-if="item.CouponSendId"
>有效期至{{ item.EndTime }}</span
>
<span class="coupon-date" v-else
>活动至{{ item.EndTime }}</span
>
<span class="coupon-date" v-if="item.CouponSendId">有效期至{{ item.EndTime }}</span>
<span class="coupon-date" v-else>活动至{{ item.EndTime }}</span>
</div>
</div>
@ -145,10 +121,7 @@
</div>
</div> -->
</div>
<no-data
:text="'该商家最近没有优惠'"
:isShow="!(couponList && couponList.length > 0)"
/>
<no-data :text="'该商家最近没有优惠'" :isShow="!(couponList && couponList.length > 0)" />
</div>
</div>
@ -165,45 +138,25 @@
<div style="padding: 0 16rpx 40rpx 32rpx">
<div v-if="false">
<div class="info-desc-title" v-if="storeMsg.ImgList">
<van-icon
name="photo-o"
size="40rpx"
color="#CAA97F"
custom-style="margin-right:16rpx;"
></van-icon>
<van-icon name="photo-o" size="40rpx" color="#CAA97F" custom-style="margin-right:16rpx;"></van-icon>
<text>商家实景</text>
</div>
<div class="store-photo-box" v-if="storeMsg.ImgList">
<!-- <div class="store-photo" v-for="(images,i) in storeMsg.ImgList" @click="seePhone(storeMsg.ImgList,i)" :key="i">
<image mode="aspectFill" :src="images.IMAGE_URL"></image>
</div> -->
<swiper
scroll-x="true"
class="swiper-image"
:display-multiple-items="
storeMsg.ImgList.length > 1 ? 2 : 1
"
next-margin="120rpx"
:style="storeMsg.ImgList.length == 1 ? 'width:405rpx' : ''"
>
<swiper-item
v-for="(item, i) in storeMsg.ImgList"
:key="i"
class="store-photo"
@click="seePhone(storeMsg.ImgList, i)"
>
<swiper scroll-x="true" class="swiper-image" :display-multiple-items="storeMsg.ImgList.length > 1 ? 2 : 1
" next-margin="120rpx" :style="storeMsg.ImgList.length == 1 ? 'width:405rpx' : ''">
<swiper-item v-for="(item, i) in storeMsg.ImgList" :key="i" class="store-photo"
@click="seePhone(storeMsg.ImgList, i)">
<image mode="aspectFill" :src="item.IMAGE_URL"></image>
</swiper-item>
</swiper>
</div>
<block v-if="foodImages.length > 0">
<div class="info-desc-title">
<van-icon
name="photo-o"
size="40rpx"
color="#CAA97F"
custom-style="margin-right:16rpx;vertical-align:middle;"
></van-icon>
<van-icon name="photo-o" size="40rpx" color="#CAA97F"
custom-style="margin-right:16rpx;vertical-align:middle;"></van-icon>
<span>推荐商品</span>
</div>
<div class="store-photo-box">
@ -211,19 +164,10 @@
<image mode="aspectFill" :src="images.IMAGE_URL"></image>
<div class="photo-name">{{images.TITLE}}</div>
</div> -->
<swiper
scroll-x="true"
class="swiper-image"
:display-multiple-items="foodImages.length > 1 ? 2 : 1"
next-margin="120rpx"
:style="foodImages.length == 1 ? 'width:405rpx' : ''"
>
<swiper-item
v-for="(item, i) in foodImages"
:key="i"
class="store-photo"
@click="seePhone(foodImages, i)"
>
<swiper scroll-x="true" class="swiper-image" :display-multiple-items="foodImages.length > 1 ? 2 : 1"
next-margin="120rpx" :style="foodImages.length == 1 ? 'width:405rpx' : ''">
<swiper-item v-for="(item, i) in foodImages" :key="i" class="store-photo"
@click="seePhone(foodImages, i)">
<image mode="aspectFill" :src="item.IMAGE_URL"></image>
<div class="photo-name">{{ item.TITLE }}</div>
</swiper-item>
@ -236,10 +180,7 @@
<div class="storeItem">
<div class="itemTop">
<div class="imgBox">
<image
class="storeIcon"
src="/static/images/home/MERCHANTSDESC.png"
/>
<image class="storeIcon" src="/static/images/home/MERCHANTSDESC.png" />
</div>
<span class="desc">商家介绍：</span>
@ -252,10 +193,7 @@
<div class="storeItem">
<div class="itemTop">
<div class="imgBox">
<image
class="storeIcon"
src="/static/images/home/onlineTime.png"
/>
<image class="storeIcon" src="/static/images/home/onlineTime.png" />
</div>
<span class="desc">营业时间：</span>
@ -268,10 +206,7 @@
<div class="storeItem">
<div class="itemTop">
<div class="imgBox">
<image
class="storeIcon"
src="/static/images/home/detailPhone.png"
/>
<image class="storeIcon" src="/static/images/home/detailPhone.png" />
</div>
<span class="desc">电话：</span>
@ -284,10 +219,7 @@
<div class="storeItem">
<div class="itemTop">
<div class="imgBox">
<image
class="storeIcon"
src="/static/images/home/addressIcon.png"
/>
<image class="storeIcon" src="/static/images/home/addressIcon.png" />
</div>
<span class="desc">地址：</span>
@ -300,12 +232,8 @@
<div class="store-info" v-if="false">
<div class="info-unit">
<van-icon
name="hotel-o"
size="40rpx"
color="#CAA97F"
custom-style="margin-right:16rpx;vertical-align:middle;"
></van-icon>
<van-icon name="hotel-o" size="40rpx" color="#CAA97F"
custom-style="margin-right:16rpx;vertical-align:middle;"></van-icon>
<span class="info-unit-title"> 商家介绍 </span>
<block v-if="!storeMsg.MERCHANTS_DESC">暂无</block>
</div>
@ -314,32 +242,20 @@
</div>
<div class="info-unit">
<van-icon
name="phone-circle-o"
size="40rpx"
color="#CAA97F"
custom-style="margin-right:16rpx;vertical-align:middle;"
></van-icon>
<van-icon name="phone-circle-o" size="40rpx" color="#CAA97F"
custom-style="margin-right:16rpx;vertical-align:middle;"></van-icon>
<span class="info-unit-title"> 商家电话 </span>
{{ storeMsg.MERCHANTS_TELEPHONE || "暂无" }}
</div>
<div class="info-unit">
<van-icon
name="location-o"
size="40rpx"
color="#CAA97F"
custom-style="margin-right:16rpx;vertical-align:middle;"
></van-icon>
<van-icon name="location-o" size="40rpx" color="#CAA97F"
custom-style="margin-right:16rpx;vertical-align:middle;"></van-icon>
<span class="info-unit-title"> 商家地址 </span>
{{ storeMsg.MERCHANTS_ADDRESS || "暂无" }}
</div>
<div class="info-unit">
<van-icon
name="todo-list-o"
size="40rpx"
color="#CAA97F"
custom-style="margin-right:16rpx;vertical-align:middle;"
></van-icon>
<van-icon name="todo-list-o" size="40rpx" color="#CAA97F"
custom-style="margin-right:16rpx;vertical-align:middle;"></van-icon>
<span class="info-unit-title"> 营业时间 </span>
{{ storeMsg.BUS_STARTDATE || "暂无" }}
</div>
@ -349,11 +265,8 @@
</div>
</div>
</div>
<UniPopup
:show="isLogin && !user.MEMBERSHIP_MOBILEPHONE"
@close="isLogin = false"
custom-style="border-radius: 24rpx;"
>
<UniPopup :show="isLogin && !user.MEMBERSHIP_MOBILEPHONE" @close="isLogin = false"
custom-style="border-radius: 24rpx;">
<div class="pop-box">
<div class="pop-title">温馨提示</div>
<div class="pop-body">您还没有登录，快去登录吧!</div>
@ -402,6 +315,8 @@ export default {
{ label: "评价", value: 1 },
{ label: "商家", value: 2 },
],
monthlySales: "",//月售
perCapita: '',// 人均
};
},
computed: {
@ -528,6 +443,16 @@ export default {
console.log("type", type);
this.loginType = type;
if (options.monthlySales) {
this.monthlySales = options.monthlySales
}
if (options.perCapita) {
this.perCapita = options.perCapita
}
if (options.noAppoint) {
// 如果页面来源于点餐页面 则不再显示去点餐按钮
this.pageMsg.noAppoint = true;
@ -611,7 +536,7 @@ export default {
</script>
<style lang="stylus" scope >
<style lang="stylus" scope>
color999 = #999;
.store-cont {

1519
pages/user/index.vue
View File

File diff suppressed because it is too large Load Diff

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

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

5
unpackage/dist/dev/mp-weixin/common/vendor.js vendored
View File

@ -12873,7 +12873,7 @@ var staticImagePath = 'https://eshangtech.com/ShopICO';
// let nodeUrl = 'https://es.robot-z.cn'
var nodeUrl = 'https://es.eshangtech.com';
var javaUrl = "https://admin.es.eshangtech.com/platform";
var zzyLocal = "http://10.104.1.35:8901";
var zzyLocal = "https://api.eshangtech.com/MemberApi";
// let javaUrl = `http://10.104.1.175:8070/platform`
var type = uni.getSystemInfoSync();
@ -12906,7 +12906,8 @@ var api = {
var requstOptions = {
url: isWebApi ? _this.url + control : _this.url,
data: data.type === 'encryption' ? {
postData: (0, _handleAes.encryptAES)(JSON.stringify(data))
name: "",
value: (0, _handleAes.encryptAES)(JSON.stringify(data))
} : data,
method: method
};

42
unpackage/dist/dev/mp-weixin/pages/allFunPage/index.js vendored
View File

@ -98,6 +98,29 @@ __webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
var components
try {
components = {
uniPopup: function () {
return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 440))
},
}
} catch (e) {
if (
e.message.indexOf("Cannot find module") !== -1 &&
e.message.indexOf(".vue") !== -1
) {
console.error(e.message)
console.error("1. 排查组件名称拼写是否正确")
console.error(
"2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"
)
console.error(
"3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件"
)
} else {
throw e
}
}
var render = function () {
var _vm = this
var _h = _vm.$createElement
@ -180,6 +203,18 @@ var _default = {
uni.setStorageSync("funList", JSON.stringify(this.allFunList));
},
methods: {
// ETC的功能
handleGoETC: function handleGoETC(value) {
if (value === 1) {
uni.navigateToMiniProgram({
appId: "wxb228568a0a4f7120"
});
} else if (value === 2) {
uni.navigateTo({
url: "/pages/etcMap/index"
});
}
},
// 功能列表
handleFunClick: function handleFunClick(obj) {
console.log("obj", obj);
@ -203,9 +238,10 @@ var _default = {
});
} else if (obj.value === 4) {
// ETC
uni.navigateToMiniProgram({
appId: "wxb228568a0a4f7120"
});
// uni.navigateToMiniProgram({
// appId: "wxb228568a0a4f7120",
// });
this.$refs.ETCRef.open("center");
} else if (obj.value === 5) {
// 点餐
uni.navigateTo({

1
unpackage/dist/dev/mp-weixin/pages/allFunPage/index.json vendored
View File

@ -2,6 +2,7 @@
"navigationBarTitleText": "全部功能",
"disableScroll": true,
"usingComponents": {
"uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
"l-drag-sort": "/uni_modules/l-dragSort/components/l-dragSort/l-dragSort"
}
}

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

@ -1 +1 @@
<view class="main data-v-2a154eee"><block wx:if="{{showList}}"><view style="width:95%;" class="data-v-2a154eee"><view data-event-opts="{{[['tap',[['handleChangeType',['$event']]]]]}}" class="topText data-v-2a154eee" bindtap="__e">{{managering?"完成":"管理"}}</view><block wx:if="{{managering}}"><view class="data-v-2a154eee"><l-drag-sort vue-id="73b6399d-1" list="{{allFunList}}" lineHeight="{{112}}" data-event-opts="{{[['^change',[['change']]]]}}" bind:change="__e" class="data-v-2a154eee" bind:__l="__l"></l-drag-sort></view></block><block wx:if="{{!managering}}"><view class="funList data-v-2a154eee"><block wx:for="{{allFunList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleFunClick',['$0'],[[['allFunList','',index]]]]]]]}}" class="funItem data-v-2a154eee" bindtap="__e"><view class="funLeft data-v-2a154eee"><image class="funIcon data-v-2a154eee" src="{{pageType==='spring'?item.springSrc:item.src}}"></image><text class="funText data-v-2a154eee">{{item.label||"-"}}</text></view><view class="funRight data-v-2a154eee"></view></view></block></view></block></view></block></view>
<view class="main data-v-2a154eee"><block wx:if="{{showList}}"><view style="width:95%;" class="data-v-2a154eee"><view data-event-opts="{{[['tap',[['handleChangeType',['$event']]]]]}}" class="topText data-v-2a154eee" bindtap="__e">{{managering?"完成":"管理"}}</view><block wx:if="{{managering}}"><view class="data-v-2a154eee"><l-drag-sort vue-id="73b6399d-1" list="{{allFunList}}" lineHeight="{{112}}" data-event-opts="{{[['^change',[['change']]]]}}" bind:change="__e" class="data-v-2a154eee" bind:__l="__l"></l-drag-sort></view></block><block wx:if="{{!managering}}"><view class="funList data-v-2a154eee"><block wx:for="{{allFunList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleFunClick',['$0'],[[['allFunList','',index]]]]]]]}}" class="funItem data-v-2a154eee" bindtap="__e"><view class="funLeft data-v-2a154eee"><image class="funIcon data-v-2a154eee" src="{{pageType==='spring'?item.springSrc:item.src}}"></image><text class="funText data-v-2a154eee">{{item.label||"-"}}</text></view><view class="funRight data-v-2a154eee"></view></view></block></view></block></view></block><uni-popup vue-id="73b6399d-2" data-ref="ETCRef" class="data-v-2a154eee vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><view class="ETCPopup data-v-2a154eee"><view data-event-opts="{{[['tap',[['handleGoETC',[1]]]]]}}" class="ETCItem data-v-2a154eee" bindtap="__e"><image class="itemImg data-v-2a154eee" src="/static/images/home/newEtc.svg"></image><text class="itemText data-v-2a154eee">ETC小程序</text></view><view data-event-opts="{{[['tap',[['handleGoETC',[2]]]]]}}" class="ETCItem data-v-2a154eee" bindtap="__e"><image class="itemImg data-v-2a154eee" src="/static/images/home/ETCmap.svg"></image><text class="itemText data-v-2a154eee">ETC网点</text></view></view></uni-popup></view>

32
unpackage/dist/dev/mp-weixin/pages/allFunPage/index.wxss vendored
View File

@ -57,4 +57,36 @@
width: 32rpx;
height: 32rpx;
}
.main .ETCPopup.data-v-2a154eee {
width: 80vw;
height: 120px;
background: #fff;
border-radius: 32rpx;
box-sizing: border-box;
padding: 32rpx;
display: flex;
align-items: center;
justify-content: space-between;
}
.main .ETCPopup .ETCItem.data-v-2a154eee {
width: calc(50% - 32rpx);
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.main .ETCPopup .ETCItem .itemImg.data-v-2a154eee {
width: 80rpx;
height: 80rpx;
margin-bottom: 24rpx;
}
.main .ETCPopup .ETCItem .itemText.data-v-2a154eee {
font-family: "PingFangSC";
font-weight: 400;
font-size: 24rpx;
line-height: 32rpx;
text-align: justify;
font-style: normal;
white-space: nowrap;
}

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

@ -321,11 +321,13 @@ var _default = {
swiperList: [
// "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg",
// "http://saas.eshangtech.com/minTestImg/DragonBoatFestival.jpg",
"http://saas.eshangtech.com/minTestImg/banner_0619_0625.png", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区_1.jpg"],
// "https://eshangtech.com/minTestImg/banner_0626_0702.png",
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区_1.jpg"],
previewImageList: [
// "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg",
// "http://saas.eshangtech.com/minTestImg/DragonBoatFestival.jpg",
"http://saas.eshangtech.com/minTestImg/banner_0619_0625.png", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正太泰国榴莲.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区.jpg"],
// "https://eshangtech.com/minTestImg/banner_0626_0702.png",
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/正太泰国榴莲.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区.jpg"],
// 预览图数组
roadStatusList: [],
// 路况播报
@ -354,27 +356,19 @@ var _default = {
// 判断是否显示海报
isChangeIcon: true,
// 判断是否切换商城的图表
triggered: false
triggered: false,
poster: {} // 海报信息
};
},
onLoad: function onLoad() {
var _this2 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
var stronge, _this, systemInfo, height, currentService, seatInfo, funList, newFunList;
var stronge, systemInfo, height, currentService, seatInfo, funList, newFunList, _this;
return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
stronge = uni.getStorageSync("showIndexPoster"); // this.$refs.noticeRef.open("center");
if (new Date("2025-06-19 00:00:00").getTime() < new Date().getTime() && new Date("2025-06-25 23:59:59").getTime() > new Date().getTime()) {
_this2.$refs.noticeRef.open("center");
_this = _this2;
setTimeout(function () {
_this.$refs.noticeRef.close();
}, 8000);
} else {
_this2.showPoster = false;
}
stronge = uni.getStorageSync("showIndexPoster");
_this2.menu = uni.getMenuButtonBoundingClientRect();
systemInfo = uni.getSystemInfoSync(); // 判断如果是苹果手机 那么把它底部的安全距离存起来
if (systemInfo.osName === "ios") {
@ -409,6 +403,22 @@ var _default = {
} else {
uni.setStorageSync("funList", JSON.stringify(_this2.funList));
}
_context.next = 13;
return _this2.handleGetAdvertisementData();
case 13:
console.log('this.poster', _this2.poster);
// this.$refs.noticeRef.open("center");
// if (new Date("2025-06-25 00:00:00").getTime() < new Date().getTime() && new Date("2025-07-02 23:59:59").getTime() > new Date().getTime()) {
if (new Date(_this2.poster.PRESALE_STARTTIME).getTime() < new Date().getTime() && new Date(_this2.poster.PRESALE_ENDTIME).getTime() > new Date().getTime()) {
_this2.$refs.noticeRef.open("center");
_this = _this2;
setTimeout(function () {
_this.$refs.noticeRef.close();
}, 8000);
} else {
_this2.showPoster = false;
}
// 高速头条播报
_this2.handleGetHighwayHeadlines();
@ -421,7 +431,7 @@ var _default = {
// this.handleAes()
_this2.$utils.addUserBehaviorNew();
case 17:
case 20:
case "end":
return _context.stop();
}
@ -543,14 +553,98 @@ var _default = {
},
methods: {
// 测试加密的方法
handleAes: function handleAes() {
// 拿到广告数据
handleGetAdvertisementData: function handleGetAdvertisementData() {
var _this5 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
var req, str, data;
var minReq, req, data1, req2, data2, res1, res2;
return _regenerator.default.wrap(function _callee4$(_context4) {
while (1) {
switch (_context4.prev = _context4.next) {
case 0:
minReq = {
ADDTIME: "2025-01-03T10:51:04",
APPGUID: "2693711a-72eb-48dc-b3dc-5122424e8fd4",
APPNAME: "",
INTERFACE_ADDRESS: "",
OPERATE_DATE: "2025-01-07T09:44:04",
OWNERUNIT_ID: 911,
OWNERUNIT_NAME: "云南交投集团经营开发有限公司彩云驿商业管理分公司",
PROVINCE_CODE: null,
STAFF_ID: 1,
STAFF_NAME: "系统开发者",
WECHATAPPSIGN_CODE: "",
WECHATAPPSIGN_DESC: "",
WECHATAPPSIGN_ID: 38,
WECHATAPPSIGN_NAME: "彩云驿商城",
WECHATAPP_APPID: "wxee018fb96955552a",
WECHATAPP_APPSECRET: "4d7f57d88b38b593781b4b0fd9e1a323",
WECHATPUBLICSIGN_ID: 3
}; // let req = {
// WECHATAPPSIGN_ID: minReq.WECHATAPPSIGN_ID,
// WECHATAPP_APPID: minReq.WECHATAPP_APPID,
// USERDEFINEDTYPE_NAME: "小程序海报",
// PRESALE_STARTTIME: "2025-06-26 00:00:00",
// PRESALE_ENDTIME: "2025-07-02 23:59:59",
// GOODSTYPE: "7000",
// USERDEFINEDTYPE_STATE: 1,
// USERDEFINEDTYPE_ICO: "https://eshangtech.com/minTestImg/banner_0626_0702.png",
// OWNERUNIT_ID: 911,
// PROVINCE_CODE: "530000",
// STAFF_ID: 2785,
// type: 'encryption'
// }
// const data = await this.$api.$zzyLocalPost(
// "/MallBasic/SynchroUSERDEFINEDTYPE",
// req
// );
// console.log('datadatadatadatadatadatadatadatadata', data);
req = {
SearchParameter: {
OWNERUNIT_ID: 911,
GOODSTYPE: 7000
},
SortStr: "OPERATE_DATE desc",
type: 'encryption'
};
_context4.next = 4;
return _this5.$api.$zzyLocalPost("/MallBasic/GetUSERDEFINEDTYPEList", req);
case 4:
data1 = _context4.sent;
req2 = {
SearchParameter: {
OWNERUNIT_ID: 911,
GOODSTYPE: 7001
},
SortStr: "OPERATE_DATE desc",
type: 'encryption'
};
_context4.next = 8;
return _this5.$api.$zzyLocalPost("/MallBasic/GetUSERDEFINEDTYPEList", req2);
case 8:
data2 = _context4.sent;
console.log('datadatadatadatadatadatadatadatadata', data1);
console.log('datadatadatadatadatadatadatadatadata', data2);
res1 = data1.Result_Data.List;
res2 = data2.Result_Data.List;
_this5.swiperList.unshift(res1[0].USERDEFINEDTYPE_ICO);
_this5.poster = res2[0];
case 15:
case "end":
return _context4.stop();
}
}
}, _callee4);
}))();
},
// 测试加密的方法
handleAes: function handleAes() {
var _this6 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
var req, str, data;
return _regenerator.default.wrap(function _callee5$(_context5) {
while (1) {
switch (_context5.prev = _context5.next) {
case 0:
req = {
waybillNo: "434491081179331",
@ -559,16 +653,16 @@ var _default = {
};
str = JSON.stringify(req); // let jiami = encryptAES(str)
// let jiemi = decryptAES(jiami)
_context4.next = 4;
return _this5.$api.$zzyLocalPost("/WeChat/ExpressQuery", req);
_context5.next = 4;
return _this6.$api.$zzyLocalPost("/WeChat/ExpressQuery", req);
case 4:
data = _context4.sent;
data = _context5.sent;
case 5:
case "end":
return _context4.stop();
return _context5.stop();
}
}
}, _callee4);
}, _callee5);
}))();
},
// 重新获取经纬度位置
@ -578,11 +672,11 @@ var _default = {
type: "gcj02",
altitude: true,
success: function () {
var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(res) {
var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(res) {
var seatInfo;
return _regenerator.default.wrap(function _callee5$(_context5) {
return _regenerator.default.wrap(function _callee6$(_context6) {
while (1) {
switch (_context5.prev = _context5.next) {
switch (_context6.prev = _context6.next) {
case 0:
seatInfo = {
latitude: res.latitude,
@ -593,10 +687,10 @@ var _default = {
resolve(seatInfo);
case 4:
case "end":
return _context5.stop();
return _context6.stop();
}
}
}, _callee5);
}, _callee6);
}));
function success(_x) {
return _success.apply(this, arguments);
@ -611,25 +705,25 @@ var _default = {
},
// 重置顶部方法顺序
handleReloadFunIndex: function handleReloadFunIndex() {
var _this6 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
var _this7 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
var _this, seatInfo;
return _regenerator.default.wrap(function _callee6$(_context6) {
return _regenerator.default.wrap(function _callee7$(_context7) {
while (1) {
switch (_context6.prev = _context6.next) {
switch (_context7.prev = _context7.next) {
case 0:
_this6.triggered = true;
_this = _this6;
_context6.next = 4;
return _this6.handleGetNewPosition();
_this7.triggered = true;
_this = _this7;
_context7.next = 4;
return _this7.handleGetNewPosition();
case 4:
seatInfo = _context6.sent;
seatInfo = _context7.sent;
uni.setStorageSync("seatInfo", JSON.stringify(seatInfo));
uni.setStorageSync("actualLocation", JSON.stringify(seatInfo));
_context6.next = 9;
_context7.next = 9;
return _this.handleGetNearService(seatInfo.latitude, seatInfo.longitude);
case 9:
return _context6.abrupt("return", new Promise(function (resolve) {
return _context7.abrupt("return", new Promise(function (resolve) {
setTimeout(function () {
_this.funList = [{
label: "服务区",
@ -735,10 +829,10 @@ var _default = {
}));
case 10:
case "end":
return _context6.stop();
return _context7.stop();
}
}
}, _callee6);
}, _callee7);
}))();
},
handleHidePopup: function handleHidePopup() {
@ -764,14 +858,14 @@ var _default = {
},
// 查询现在的充电桩
handleGetChargingStation: function handleGetChargingStation(obj) {
var _this7 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
var _this8 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
var _this;
return _regenerator.default.wrap(function _callee7$(_context7) {
return _regenerator.default.wrap(function _callee8$(_context8) {
while (1) {
switch (_context7.prev = _context7.next) {
switch (_context8.prev = _context8.next) {
case 0:
_this = _this7;
_this = _this8;
uni.request({
url: "https://xny.yciccloud.com/interconnect/api/interconnection/open/getConnectList",
//仅为示例，并非真实接口地址。
@ -824,41 +918,6 @@ var _default = {
}
});
case 2:
case "end":
return _context7.stop();
}
}
}, _callee7);
}))();
},
// 拿到服务区详情
handleGetServiceDetail: function handleGetServiceDetail(id) {
var _this8 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
var req, data, obj;
return _regenerator.default.wrap(function _callee8$(_context8) {
while (1) {
switch (_context8.prev = _context8.next) {
case 0:
if (id) {
_context8.next = 2;
break;
}
return _context8.abrupt("return");
case 2:
req = {
ServerpartId: id,
latitude: _this8.seat.latitude,
longitude: _this8.seat.longitude
};
_context8.next = 5;
return _this8.$api.$get("/CommercialApi/BaseInfo/GetServerpartInfo", req);
case 5:
data = _context8.sent;
obj = data.Result_Data;
_this8.serviceDetail = obj;
_this8.serviceDetail.sumDetail = _this8.handleMergeDetail(obj);
case 9:
case "end":
return _context8.stop();
}
@ -866,6 +925,41 @@ var _default = {
}, _callee8);
}))();
},
// 拿到服务区详情
handleGetServiceDetail: function handleGetServiceDetail(id) {
var _this9 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
var req, data, obj;
return _regenerator.default.wrap(function _callee9$(_context9) {
while (1) {
switch (_context9.prev = _context9.next) {
case 0:
if (id) {
_context9.next = 2;
break;
}
return _context9.abrupt("return");
case 2:
req = {
ServerpartId: id,
latitude: _this9.seat.latitude,
longitude: _this9.seat.longitude
};
_context9.next = 5;
return _this9.$api.$get("/CommercialApi/BaseInfo/GetServerpartInfo", req);
case 5:
data = _context9.sent;
obj = data.Result_Data;
_this9.serviceDetail = obj;
_this9.serviceDetail.sumDetail = _this9.handleMergeDetail(obj);
case 9:
case "end":
return _context9.stop();
}
}
}, _callee9);
}))();
},
// 预览查看
handleShowPreview: function handleShowPreview(obj) {
uni.previewImage({
@ -1187,15 +1281,15 @@ var _default = {
},
// 拿到最近的服务区数据
handleGetNearService: function handleGetNearService(latitude, longitude) {
var _this9 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
var _this10 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
var req, data, nearService, idList;
return _regenerator.default.wrap(function _callee9$(_context9) {
return _regenerator.default.wrap(function _callee10$(_context10) {
while (1) {
switch (_context9.prev = _context9.next) {
switch (_context10.prev = _context10.next) {
case 0:
req = {
Province_Code: _this9.user.PROVINCE_CODE || "530000",
Province_Code: _this10.user.PROVINCE_CODE || "530000",
longitude: longitude,
latitude: latitude,
showservice: true,
@ -1208,39 +1302,39 @@ var _default = {
// "/CommercialApi/BaseInfo/GetServerpartList",
// req
// );
_context9.next = 4;
return _this9.$api.$javaGet('/third-party/getServerPartList', req);
_context10.next = 4;
return _this10.$api.$javaGet('/third-party/getServerPartList', req);
case 4:
data = _context9.sent;
_this9.serverPartList = data.Result_Data.List;
nearService = _this9.serverPartList[0];
nearService.sumDetail = _this9.handleMergeDetail(nearService);
_this9.serviceDetail = nearService;
data = _context10.sent;
_this10.serverPartList = data.Result_Data.List;
nearService = _this10.serverPartList[0];
nearService.sumDetail = _this10.handleMergeDetail(nearService);
_this10.serviceDetail = nearService;
uni.setStorageSync("currentService", nearService);
idList = [1212, 1222, 1139, 1215];
if (idList.indexOf(nearService.SERVERPART_ID) !== -1) {
_this9.handleGetChargingStation(nearService);
_this10.handleGetChargingStation(nearService);
}
uni.hideLoading();
case 13:
case "end":
return _context9.stop();
return _context10.stop();
}
}
}, _callee9);
}, _callee10);
}))();
},
// 高速头条播报
handleGetHighwayHeadlines: function handleGetHighwayHeadlines() {
var _this10 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
var _this11 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
var start, end, params, time, req, signText, sign, tweetsData, newReq, newData, list;
return _regenerator.default.wrap(function _callee10$(_context10) {
return _regenerator.default.wrap(function _callee11$(_context11) {
while (1) {
switch (_context10.prev = _context10.next) {
switch (_context11.prev = _context11.next) {
case 0:
start = "".concat(_this10.$moment.now().set("month", -1).format("YYYY-MM-DD"), " 00:00:00");
end = "".concat(_this10.$moment.now().format("YYYY-MM-DD"), " 23:59:59");
start = "".concat(_this11.$moment.now().set("month", -1).format("YYYY-MM-DD"), " 00:00:00");
end = "".concat(_this11.$moment.now().format("YYYY-MM-DD"), " 23:59:59");
params = {
startQueryTime: start,
// 开始时间
@ -1258,7 +1352,7 @@ var _default = {
sign_type: "RSA2"
};
signText = "app_id=".concat(req.app_id, "&biz_content=").concat(req.biz_content, "&charset=UTF-8&pid=").concat(req.app_id, "&service=trawe.eats.etc&utc_timestamp=").concat(req.utc_timestamp, "&version=1.0"); // 签名
_context10.next = 8;
_context11.next = 8;
return new Promise(function (resolve, reject) {
uni.request({
url: "https://admin.es.eshangtech.com/prod-api/RSA/sign",
@ -1276,11 +1370,11 @@ var _default = {
});
});
case 8:
sign = _context10.sent;
sign = _context11.sent;
req.sign = sign;
// 推文数据
_context10.next = 12;
_context11.next = 12;
return new Promise(function (resolve, reject) {
uni.request({
url: "https://sxgzh.etclife.cn/etc/api/v1/gzh/point/tweets",
@ -1305,7 +1399,7 @@ var _default = {
});
});
case 12:
tweetsData = _context10.sent;
tweetsData = _context11.sent;
// if (tweetsData && tweetsData.length > 0) {
// this.roadStatusList = tweetsData;
// } else {
@ -1314,33 +1408,33 @@ var _default = {
newReq = {
SearchParameter: {
// NOTICEINFO_TYPES: 1010,
PROVINCE_CODE: _this10.user.PROVINCE_CODE || "530000",
PROVINCE_CODE: _this11.user.PROVINCE_CODE || "530000",
NOTICEINFO_STATE: 1
},
PageIndex: 1,
PageSize: 10,
appId: "wxee018fb96955552a"
};
_context10.next = 16;
return _this10.$api.$post("/EShangApiMain/Notice/GetNOTICEINFOList", newReq);
_context11.next = 16;
return _this11.$api.$post("/EShangApiMain/Notice/GetNOTICEINFOList", newReq);
case 16:
newData = _context10.sent;
newData = _context11.sent;
list = newData.Result_Data.List; // if (list && list.length > 0) {
// } else {
// this.roadStatusList = [];
// }
// this.roadStatusList = list.concat(tweetsData);
_this10.roadStatusList = list;
_this11.roadStatusList = list;
// this.roadStatusList.unshift({
// NOTICEINFO_TITLE: "最新放假通知：调休2天，免费8天！",
// });
case 19:
case "end":
return _context10.stop();
return _context11.stop();
}
}
}, _callee10);
}, _callee11);
}))();
},
// 跳转高速头条
@ -1351,49 +1445,6 @@ var _default = {
},
// 拿到促销单品的数据 5030
handleGetSpecialOffers: function handleGetSpecialOffers() {
var _this11 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
var data, list, shopList;
return _regenerator.default.wrap(function _callee11$(_context11) {
while (1) {
switch (_context11.prev = _context11.next) {
case 0:
_context11.next = 2;
return _this11.$api.getCoop({
action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911,
COMMODITYNATURE: 5030,
excludeNature: 5070,
justCommodity: 1
});
case 2:
data = _context11.sent;
list = data.Data.List;
shopList = [];
if (list && list.length > 0) {
list.forEach(function (item) {
if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
item.COMMODITYLIST.forEach(function (subItem) {
shopList.push(subItem);
});
}
});
}
if (shopList && shopList.length > 0) {
_this11.specialOffersList = shopList.slice(0, 2);
} else {
_this11.specialOffersList = [];
}
case 7:
case "end":
return _context11.stop();
}
}
}, _callee11);
}))();
},
// 拿到甄选商品 5040
handleGetProductsList: function handleGetProductsList() {
var _this12 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12() {
var data, list, shopList;
@ -1405,7 +1456,7 @@ var _default = {
return _this12.$api.getCoop({
action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911,
COMMODITYNATURE: 5040,
COMMODITYNATURE: 5030,
excludeNature: 5070,
justCommodity: 1
});
@ -1423,9 +1474,9 @@ var _default = {
});
}
if (shopList && shopList.length > 0) {
_this12.productsList = shopList.slice(0, 2);
_this12.specialOffersList = shopList.slice(0, 2);
} else {
_this12.productsList = [];
_this12.specialOffersList = [];
}
case 7:
case "end":
@ -1435,8 +1486,8 @@ var _default = {
}, _callee12);
}))();
},
// 拿到 商城精品 3000
handleGetShoppingMall: function handleGetShoppingMall() {
// 拿到甄选商品 5040
handleGetProductsList: function handleGetProductsList() {
var _this13 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13() {
var data, list, shopList;
@ -1448,7 +1499,7 @@ var _default = {
return _this13.$api.getCoop({
action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911,
COMMODITYNATURE: 3000,
COMMODITYNATURE: 5040,
excludeNature: 5070,
justCommodity: 1
});
@ -1456,6 +1507,49 @@ var _default = {
data = _context13.sent;
list = data.Data.List;
shopList = [];
if (list && list.length > 0) {
list.forEach(function (item) {
if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
item.COMMODITYLIST.forEach(function (subItem) {
shopList.push(subItem);
});
}
});
}
if (shopList && shopList.length > 0) {
_this13.productsList = shopList.slice(0, 2);
} else {
_this13.productsList = [];
}
case 7:
case "end":
return _context13.stop();
}
}
}, _callee13);
}))();
},
// 拿到 商城精品 3000
handleGetShoppingMall: function handleGetShoppingMall() {
var _this14 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee14() {
var data, list, shopList;
return _regenerator.default.wrap(function _callee14$(_context14) {
while (1) {
switch (_context14.prev = _context14.next) {
case 0:
_context14.next = 2;
return _this14.$api.getCoop({
action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911,
COMMODITYNATURE: 3000,
excludeNature: 5070,
justCommodity: 1
});
case 2:
data = _context14.sent;
list = data.Data.List;
shopList = [];
if (list && list.length > 0) {
list.forEach(function (item) {
if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
@ -1477,13 +1571,13 @@ var _default = {
}
});
}
_this13.shoppingMall = shopList;
_this14.shoppingMall = shopList;
case 7:
case "end":
return _context13.stop();
return _context14.stop();
}
}
}, _callee13);
}, _callee14);
}))();
},
// 打开地图的跳转

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

File diff suppressed because one or more lines are too long

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

@ -302,6 +302,14 @@
text-align: left;
font-style: normal;
}
.main .content .nearbyScenic.data-v-57280228 {
width: 100%;
box-sizing: border-box;
padding: 24rpx 20rpx;
margin-top: 18rpx;
background: #FFFFFF;
border-radius: 16rpx;
}
.main .content .roadStatus.data-v-57280228 {
width: 100%;
margin-top: 40rpx;
@ -618,7 +626,6 @@
height: calc(2688 * 70vw / 1242);
background: #fff;
border-radius: 32rpx;
background-image: url(https://eshangtech.com/minTestImg/caiyunyiguanggao_0619_0625.png);
background-repeat: no-repeat;
background-size: 100% 100%;
box-sizing: border-box;

17
unpackage/dist/dev/mp-weixin/pages/newEvaluate/index.js vendored
View File

@ -125,15 +125,6 @@ var render = function () {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
var g0 = false ? undefined : null
_vm.$mp.data = Object.assign(
{},
{
$root: {
g0: g0,
},
}
)
}
var recyclableRender = false
var staticRenderFns = []
@ -220,7 +211,10 @@ var _default = {
}),
methods: {
isAnonymous: function isAnonymous(event, item) {
item.isAnonymous = event.mp.detail;
console.log('eventevent', event);
// item.isAnonymous = event.mp.detail;
item.isAnonymous = !item.isAnonymous;
},
changeRate: function changeRate(event, item) {
this.saveMsg.commentScore = event.value;
@ -360,6 +354,8 @@ var _default = {
title: "正在提交...",
mask: true
});
console.log('data', data);
return;
this.$api.postCoop(data).then(function (rs) {
uni.hideLoading();
_this.noPost = true;
@ -393,6 +389,7 @@ var _default = {
merchantsId: id
}).then(function (res) {
var _data = res.Data;
console.log('_data_data_data_data', _data);
_this.storeMsg = _data;
});
},

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

File diff suppressed because one or more lines are too long

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

@ -209,7 +209,7 @@ var _default = {
this.pageType = query.pageType;
}
console.log("this.currentTab", this.currentTab);
var type = this.currentTab === 1 ? "" : this.currentTab === 2 ? "1005" : this.currentTab === 3 ? "1010,2000" : this.currentTab === 4 ? "2010" : this.currentTab === 5 ? "" : "";
var type = this.currentTab === 1 ? "1010,2010,3000,8000,8010,8020,8900,8999,9000,9999" : this.currentTab === 2 ? "1005" : this.currentTab === 3 ? "1010,2000" : this.currentTab === 4 ? "2010" : this.currentTab === 5 ? "" : "";
// 获取订单数据
this.handleGetOrderList(type);
this.$utils.addUserBehaviorNew();
@ -218,7 +218,7 @@ var _default = {
// 滚动到底部 加载更多
handleScrollTolower: function handleScrollTolower() {
this.pageMsg.pageIndex = this.pageMsg.pageIndex + 1;
var type = this.currentTab === 1 ? "" : this.currentTab === 2 ? "1005" : this.currentTab === 3 ? "1010,2000" : this.currentTab === 4 ? "2010" : this.currentTab === 5 ? "" : "";
var type = this.currentTab === 1 ? "1010,2010,3000,8000,8010,8020,8900,8999,9000,9999" : this.currentTab === 2 ? "1005" : this.currentTab === 3 ? "1010,2000" : this.currentTab === 4 ? "2010" : this.currentTab === 5 ? "" : "";
this.handleGetOrderList(type);
},
handleTab: function handleTab(val) {
@ -229,7 +229,7 @@ var _default = {
};
this.currentTab = val;
this.orderList = [];
var type = val === 1 ? "" : val === 2 ? "1005" : val === 3 ? "1010,2000" : val === 4 ? "2010" : val === 5 ? "" : "";
var type = val === 1 ? "1010,2010,3000,8000,8010,8020,8900,8999,9000,9999" : val === 2 ? "1005" : val === 3 ? "1010,2000" : val === 4 ? "2010" : val === 5 ? "" : "";
this.handleGetOrderList(type);
},
// 下拉刷新的方法
@ -248,7 +248,7 @@ var _default = {
isOver: false
};
_this.triggered = true;
type = _this.currentTab === 1 ? "" : _this.currentTab === 2 ? "1005" : _this.currentTab === 3 ? "1010,2000" : _this.currentTab === 4 ? "2010" : _this.currentTab === 5 ? "" : "";
type = _this.currentTab === 1 ? "1010,2010,3000,8000,8010,8020,8900,8999,9000,9999" : _this.currentTab === 2 ? "1005" : _this.currentTab === 3 ? "1010,2000" : _this.currentTab === 4 ? "2010" : _this.currentTab === 5 ? "" : "";
_context.next = 6;
return _this.handleGetOrderList(type);
case 6:
@ -270,7 +270,7 @@ var _default = {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
type = _this2.currentTab === 1 ? "" : _this2.currentTab === 2 ? "1005" : _this2.currentTab === 3 ? "1010,2000" : _this2.currentTab === 4 ? "2010" : _this2.currentTab === 5 ? "" : "";
type = _this2.currentTab === 1 ? "1010,2010,3000,8000,8010,8020,8900,8999,9000,9999" : _this2.currentTab === 2 ? "1005" : _this2.currentTab === 3 ? "1010,2000" : _this2.currentTab === 4 ? "2010" : _this2.currentTab === 5 ? "" : "";
_context2.next = 3;
return _this2.handleGetOrderList(type);
case 3:

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

@ -332,7 +332,7 @@ var _default = {
this.getOrderInfo();
}
},
goPayment: function goPayment(obj) {
goPayment: function goPayment(obj, payMoney) {
var _this2 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
var _this, mchid, timeStamp, nonceStr, serial_no, out_trade_no, req, reqSign, data, Authorization, AuthorizationStr;
@ -369,7 +369,7 @@ var _default = {
notify_url: "https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx",
// 商户回调地址
amount: {
total: Number(_this.couponOrder) * 100 || 1,
total: payMoney ? payMoney * 100 : Number(_this.tatalMoney) * 100 || 1,
currency: "CNY"
},
// 订单金额
@ -426,7 +426,7 @@ var _default = {
package: "prepay_id=".concat(res.data.prepay_id),
signType: "RSA",
paySign: paySign,
total_fee: Number(_this.couponOrder) * 100 || 1,
total_fee: payMoney ? payMoney * 100 : Number(_this.tatalMoney) * 100 || 1,
success: function success(res) {
console.log("res", res);
},
@ -435,7 +435,7 @@ var _default = {
},
complete: function complete(res) {
uni.redirectTo({
url: "/pages/order/orderdetail/index?orderInternal=".concat(obj.SALEBILL_ID)
url: "/pages/order/orderFoodDetail/index?orderInternal=".concat(obj.SALEBILL_ID)
});
}
});
@ -534,7 +534,7 @@ var _default = {
// setTimeout(() => {
_this.$store.commit("couponPrice", "");
uni.redirectTo({
url: "/pages/orders/orderdetail/main?orderNumber=" + _this.orderNumber + "&orderInternal=" + _this.orderInternal
url: "/pages/orders/orderFoodDetail/main?orderNumber=" + _this.orderNumber + "&orderInternal=" + _this.orderInternal
});
// }, 1000)
} else {
@ -682,7 +682,7 @@ var _default = {
}).then(function (res) {
_this.$store.commit("couponPrice", "");
uni.redirectTo({
url: "/pages/orders/orderdetail/main?orderNumber=" + _this.orderNumber + "&orderInternal=" + _this.orderInternal
url: "/pages/orders/orderFoodDetail/main?orderNumber=" + _this.orderNumber + "&orderInternal=" + _this.orderInternal
});
});
}

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

File diff suppressed because one or more lines are too long

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

@ -397,6 +397,7 @@ var _default = {
serial_no = "5BA7C0F427FC042DB5BF299E35B373D5EFCECD35"; // let out_trade_no = this.generateOutTradeNo(32)
out_trade_no = obj.SALEBILL_CODE;
console.log("obj", obj);
console.log("payMoney", payMoney ? payMoney * 100 : Number(_this.tatalMoney) * 100 || 1);
req = {
appid: "wxee018fb96955552a",
// 公众账号ID
@ -423,9 +424,9 @@ var _default = {
parameters: "POST\n/v3/pay/transactions/jsapi\n" + timeStamp + "\n" + nonceStr + "\n" + JSON.stringify(req) + "\n"
};
console.log("POST\n/v3/pay/transactions/jsapi\n" + timeStamp + "\n" + nonceStr + "\n" + JSON.stringify(req) + "\n");
_context4.next = 14;
_context4.next = 15;
return _this2.$api.$get("/WeChat/GenerateSign", reqSign);
case 14:
case 15:
data = _context4.sent;
console.log("data3213123", data.Result_Data);
Authorization = "mchid=\"".concat(mchid, "\",nonce_str=\"").concat(nonceStr, "\",signature=\"").concat(data.Result_Data, "\",timestamp=\"").concat(timeStamp, "\",serial_no=\"").concat(serial_no, "\"");
@ -492,7 +493,7 @@ var _default = {
return success;
}()
});
case 20:
case 21:
case "end":
return _context4.stop();
}

64
unpackage/dist/dev/mp-weixin/pages/register/index.js vendored
View File

@ -274,40 +274,40 @@ var _default = {
var user = _this.user;
var res = e.mp.detail;
if (e.mp.detail) {
// uni.getUserInfo({
// success (res) {
console.log("user", this.user);
var arr = {
action_type: "WeChatAuthorize",
encryptedData: encodeURIComponent(res.encryptedData),
sessionKey: encodeURIComponent(user.session_key),
iv: encodeURIComponent(res.iv),
recommendId: _this.InviteCode,
requestType: "application/x-www-form-urlencoded"
// appId:"wx6a8173c6299c7a93"
};
uni.getUserInfo({
success: function success(res) {
console.log("user", this.user);
var arr = {
action_type: "WeChatAuthorize",
encryptedData: encodeURIComponent(res.encryptedData),
sessionKey: encodeURIComponent(user.session_key),
iv: encodeURIComponent(res.iv),
recommendId: _this.InviteCode,
requestType: "application/x-www-form-urlencoded"
// appId:"wx6a8173c6299c7a93"
};
console.log('arrarrarrarrarr', arr);
_this.$api.postCoop(arr).then(function (rs) {
console.log('rsrsrsrsrsrs', rs);
rs = rs.Data;
user.USER_UNIONID = rs.USER_UNIONID;
user.WechatUserId = rs.WechatUserId;
user.MEMBERSHIP_ID = rs.MEMBERSHIP_ID;
user.INDUSTRY_MEMBERSHIP_ID = rs.INDUSTRY_MEMBERSHIP_ID;
user.MEMBERSHIP_NAME = rs.MEMBERSHIP_NAME;
user.MEMBERSHIP_MOBILEPHONE = rs.MEMBERSHIP_MOBILEPHONE;
user.ACCOUNT_BALANCE = rs.ACCOUNT_BALANCE;
user.MEMBERSHIP_POINT = rs.MEMBERSHIP_POINT;
user.MEMBERSHIP_TYPE = rs.MEMBERSHIP_TYPE;
_this.showCancel = false;
console.log("rs", rs);
_this.setUser(user);
_this.setCanIUse(false);
_this.$forceUpdate();
console.log('arrarrarrarrarr', arr);
_this.$api.postCoop(arr).then(function (rs) {
console.log('rsrsrsrsrsrs', rs);
rs = rs.Data;
user.USER_UNIONID = rs.USER_UNIONID;
user.WechatUserId = rs.WechatUserId;
user.MEMBERSHIP_ID = rs.MEMBERSHIP_ID;
user.INDUSTRY_MEMBERSHIP_ID = rs.INDUSTRY_MEMBERSHIP_ID;
user.MEMBERSHIP_NAME = rs.MEMBERSHIP_NAME;
user.MEMBERSHIP_MOBILEPHONE = rs.MEMBERSHIP_MOBILEPHONE;
user.ACCOUNT_BALANCE = rs.ACCOUNT_BALANCE;
user.MEMBERSHIP_POINT = rs.MEMBERSHIP_POINT;
user.MEMBERSHIP_TYPE = rs.MEMBERSHIP_TYPE;
_this.showCancel = false;
console.log("rs", rs);
_this.setUser(user);
_this.setCanIUse(false);
_this.$forceUpdate();
});
}
});
// }
// })
}
}
})

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

@ -646,7 +646,7 @@ var _default = {
// delta: 1,
// });
if (this.pageType === "driver") {
if (this.pageType === "driver" || this.pageType === "userInfo") {
uni.navigateBack({
delta: 1
});
@ -711,12 +711,12 @@ var _default = {
if (this.user.MEMBERSHIP_MOBILEPHONE) {
var id = item.SERVERPARTSHOP_IDS.split(",")[0];
uni.navigateTo({
url: "/pages/shopPages/shop/index?id=".concat(id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE)
url: "/pages/shopPages/shop/index?id=".concat(id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE, "&monthlySales=").concat(item.MONTHLYSALES || "", "&perCapita=").concat(item.PERCAPITA || "")
});
} else {
var _id = item.SERVERPARTSHOP_IDS.split(",")[0];
uni.navigateTo({
url: "/pages/shopPages/shop/index?id=".concat(_id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE)
url: "/pages/shopPages/shop/index?id=".concat(_id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE, "&monthlySales=").concat(item.MONTHLYSALES || "", "&perCapita=").concat(item.PERCAPITA || "")
});
this.isLogin = true;
}

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

File diff suppressed because one or more lines are too long

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

@ -155,6 +155,11 @@ var render = function () {
var g10 = _vm.pageType !== "UnionMall" ? _vm.specialOffersList.length : null
var g11 = _vm.pageType !== "UnionMall" ? _vm.todayOffersList.length : null
var g12 =
_vm.pageType !== "UnionMall" &&
_vm.productsList &&
_vm.productsList.length > 0
var g13 = g12 && _vm.pageType !== "UnionMall" ? _vm.productsList.length : null
var g14 =
_vm.pageType === "UnionMall"
? _vm.showShopList && _vm.showShopList.length > 0
: null
@ -175,6 +180,8 @@ var render = function () {
g10: g10,
g11: g11,
g12: g12,
g13: g13,
g14: g14,
},
}
)
@ -219,7 +226,9 @@ Object.defineProperty(exports, "__esModule", {
});
exports.default = void 0;
var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 30));
var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
var _methods;
var shopTabbar = function shopTabbar() {
Promise.all(/*! require.ensure | components/shopTabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/shopTabbar")]).then((function () {
return resolve(__webpack_require__(/*! ../../../components/shopTabbar.vue */ 461));
@ -507,7 +516,7 @@ var _default = {
path: "/pages/index/index?pageType=".concat(this.pageType)
};
},
methods: {
methods: (_methods = {
handleMaskClick: function handleMaskClick(e) {
this.priceRangeRefShow = false;
},
@ -1109,192 +1118,178 @@ var _default = {
}
}, _callee10);
}))();
},
// 切换甄选商品的类型
handleChangeShopMallType: function handleChangeShopMallType(obj) {
this.selectProducts = obj.UserdefinedType_Id;
this.shopMsg = {
pageSize: 6,
pageIndex: 1,
isOver: false
};
this.handleGetProductsList();
},
// 拿到甄选商品 3000
handleGetProductsList: function handleGetProductsList() {
var _this12 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
var data, list, resList, thisResList;
return _regenerator.default.wrap(function _callee11$(_context11) {
while (1) {
switch (_context11.prev = _context11.next) {
case 0:
uni.showLoading({
title: "加载中"
}
}, (0, _defineProperty2.default)(_methods, "handleGoPointsMall", function handleGoPointsMall() {
uni.navigateTo({
url: "/pages/shopPages/shopList/index?pageType=pointsMall"
});
}), (0, _defineProperty2.default)(_methods, "handleChangeShopMallType", function handleChangeShopMallType(obj) {
this.selectProducts = obj.UserdefinedType_Id;
this.shopMsg = {
pageSize: 6,
pageIndex: 1,
isOver: false
};
this.handleGetProductsList();
}), (0, _defineProperty2.default)(_methods, "handleGetProductsList", function handleGetProductsList() {
var _this12 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
var data, list, resList, thisResList;
return _regenerator.default.wrap(function _callee11$(_context11) {
while (1) {
switch (_context11.prev = _context11.next) {
case 0:
uni.showLoading({
title: "加载中"
});
// const data = await this.$api.getCoop({
// action_type: "WeChat_GetMallGoodsInfo",
// ownerUnitId: 911,
// COMMODITYNATURE: this.selectProducts === 4597 ? '' : 3000,
// userdefinedtypeId: this.selectProducts || "",
// Page_Size: this.shopMsg.pageSize,
// Page_Index: this.shopMsg.pageIndex,
// justCommodity: 1,
// // excludeNature: 5070,
// });
// 原本下面商城的内容
// const data = await this.$api.$javaGet(
// '/third-party/getWeChatGetMallGoodsInfo',
// {
// ownerUnitId: 911,
// COMMODITYNATURE: this.selectProducts === 4597 ? '' : 3000,
// userdefinedTypeId: this.selectProducts || "",
// Page_Size: this.shopMsg.pageSize,
// Page_Index: this.shopMsg.pageIndex,
// justCommodity: 1,
// }
// )
//
_context11.next = 3;
return _this12.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
ownerUnitId: 911,
justCommodity: 1,
payMethod: "2000,3000",
COMMODITYNATURE: 6000
// COMMODITYNATURE: this.selectProducts === 4597 ? '' : 3000,
// userdefinedTypeId: this.selectProducts || "",
// Page_Size: this.shopMsg.pageSize,
// Page_Index: this.shopMsg.pageIndex,
});
case 3:
data = _context11.sent;
list = data.Data.List;
console.log('积分商城', list);
resList = [];
thisResList = [];
if (_this12.shopMsg.pageIndex > 1) {
resList = _this12.productsList;
}
if (list && list.length > 0) {
// this.selectProducts = list[0].UserdefinedType_Id;
list.forEach(function (item) {
if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
item.COMMODITYLIST.forEach(function (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;
}
if (subItem.COMMODITY_RETAILPRICE && subItem.COMMODITY_RETAILPRICE.toString().indexOf(".") !== -1) {
subItem.RETbigNumber = subItem.COMMODITY_RETAILPRICE.toString().split(".")[0];
subItem.RETsmallNumber = subItem.COMMODITY_RETAILPRICE.toString().split(".")[1];
} else {
subItem.RETbigNumber = subItem.COMMODITY_RETAILPRICE;
}
thisResList.push(subItem);
});
}
});
// const data = await this.$api.getCoop({
// action_type: "WeChat_GetMallGoodsInfo",
// ownerUnitId: 911,
// COMMODITYNATURE: this.selectProducts === 4597 ? '' : 3000,
// userdefinedtypeId: this.selectProducts || "",
// Page_Size: this.shopMsg.pageSize,
// Page_Index: this.shopMsg.pageIndex,
// justCommodity: 1,
// // excludeNature: 5070,
// });
}
if (thisResList && thisResList.length < 6) {
_this12.shopMsg.isOver = true;
}
// this.productsList = list;
_this12.productsList = resList.concat(thisResList);
console.log("甄选商品", _this12.productsList);
uni.hideLoading();
// 原本下面商城的内容
// const data = await this.$api.$javaGet(
// '/third-party/getWeChatGetMallGoodsInfo',
// {
// ownerUnitId: 911,
// COMMODITYNATURE: this.selectProducts === 4597 ? '' : 3000,
// userdefinedTypeId: this.selectProducts || "",
// Page_Size: this.shopMsg.pageSize,
// Page_Index: this.shopMsg.pageIndex,
// justCommodity: 1,
// }
// )
//
_context11.next = 3;
return _this12.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
ownerUnitId: 911,
justCommodity: 1,
payMethod: "2000,3000",
COMMODITYNATURE: 6000
// COMMODITYNATURE: this.selectProducts === 4597 ? '' : 3000,
// userdefinedTypeId: this.selectProducts || "",
// Page_Size: this.shopMsg.pageSize,
// Page_Index: this.shopMsg.pageIndex,
});
case 3:
data = _context11.sent;
list = data.Data.List;
console.log('积分商城', list);
resList = [];
thisResList = [];
if (_this12.shopMsg.pageIndex > 1) {
resList = _this12.productsList;
}
if (list && list.length > 0) {
// this.selectProducts = list[0].UserdefinedType_Id;
list.forEach(function (item) {
if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
item.COMMODITYLIST.forEach(function (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;
}
if (subItem.COMMODITY_RETAILPRICE && subItem.COMMODITY_RETAILPRICE.toString().indexOf(".") !== -1) {
subItem.RETbigNumber = subItem.COMMODITY_RETAILPRICE.toString().split(".")[0];
subItem.RETsmallNumber = subItem.COMMODITY_RETAILPRICE.toString().split(".")[1];
} else {
subItem.RETbigNumber = subItem.COMMODITY_RETAILPRICE;
}
thisResList.push(subItem);
});
}
});
}
if (thisResList && thisResList.length < 6) {
_this12.shopMsg.isOver = true;
}
// this.productsList = list;
_this12.productsList = resList.concat(thisResList);
console.log("甄选商品", _this12.productsList);
uni.hideLoading();
// let shopList = []
// if (list && list.length > 0) {
// list.forEach((item) => {
// if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
// item.COMMODITYLIST.forEach((subItem) => {
// shopList.push(subItem)
// })
// }
// })
// }
case 14:
case "end":
return _context11.stop();
}
// let shopList = []
// if (list && list.length > 0) {
// list.forEach((item) => {
// if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
// item.COMMODITYLIST.forEach((subItem) => {
// shopList.push(subItem)
// })
// }
// })
// }
case 14:
case "end":
return _context11.stop();
}
}, _callee11);
}))();
},
// 返回首页
handleBackHome: function handleBackHome() {
if (this.pageType === "UnionMall") {
uni.navigateBack({
delta: 1
});
} else {
uni.switchTab({
url: "/pages/index/index"
});
}
},
// 跳转公告页面
handleGoNotice: function handleGoNotice() {
uni.navigateTo({
url: "/pages/noticePage/index"
}
}, _callee11);
}))();
}), (0, _defineProperty2.default)(_methods, "handleBackHome", function handleBackHome() {
if (this.pageType === "UnionMall") {
uni.navigateBack({
delta: 1
});
},
// 跳转商品列表接口
handleGoShopList: function handleGoShopList(value, index) {
// uni.navigateTo({
// url: `/pages/shopPages/shopList/index?type=${type}&pageType=${this.pageType || ""
// }`,
// });
uni.redirectTo({
url: "/pages/shopMallPage/shopType/index?leftId=".concat(value, "&pageType=").concat(this.pageType, "&selectIndex=").concat(index)
});
},
// 跳转商品详情
handleGoShopDetail: function handleGoShopDetail(obj) {
console.log("obj", obj);
uni.navigateTo({
url: "/pages/shopPages/shopDetail/index?id=".concat(obj.COMMODITY_ID, "&pageType=").concat(this.pageType)
});
},
// 跳转到商品分类页面
handleGoShopPage: function handleGoShopPage(obj, index) {
console.log("obj", obj);
console.log("index", index);
if (this.pageType === "UnionMall") {
// if (obj.UserdefinedType_Name === "工会活动") {
// uni.navigateTo({
// url: `/pages/allFunPage/unionActivities`,
// });
// } else {
uni.redirectTo({
url: "/pages/shopMallPage/shopType/index?leftId=".concat(obj.UserdefinedType_Id, "&pageType=").concat(this.pageType, "&selectIndex=").concat(index)
// url: `/pages/shopMallPage/shopType/index?pageType=${this.pageType}`,
});
// }
} else {
uni.redirectTo({
url: "/pages/shopMallPage/shopType/index?selectIndex=".concat(index, "&pageType=").concat(this.pageType)
});
}
},
// 活动直接跳转分类页面 分类页面的互动是第一个 所以 selectIndex 传0就好
handleGoActivityType: function handleGoActivityType() {
uni.redirectTo({
url: "/pages/shopMallPage/shopType/index?selectIndex=".concat(0, "&pageType=", this.pageType)
});
},
// 跳转工会之家
handleGoUnionMall: function handleGoUnionMall() {
uni.navigateTo({
url: "/pages/shopMallPage/index/index?pageType=UnionMall"
} else {
uni.switchTab({
url: "/pages/index/index"
});
}
}
}), (0, _defineProperty2.default)(_methods, "handleGoNotice", function handleGoNotice() {
uni.navigateTo({
url: "/pages/noticePage/index"
});
}), (0, _defineProperty2.default)(_methods, "handleGoShopList", function handleGoShopList(value, index) {
// uni.navigateTo({
// url: `/pages/shopPages/shopList/index?type=${type}&pageType=${this.pageType || ""
// }`,
// });
uni.redirectTo({
url: "/pages/shopMallPage/shopType/index?leftId=".concat(value, "&pageType=").concat(this.pageType, "&selectIndex=").concat(index)
});
}), (0, _defineProperty2.default)(_methods, "handleGoShopDetail", function handleGoShopDetail(obj) {
console.log("obj", obj);
uni.navigateTo({
url: "/pages/shopPages/shopDetail/index?id=".concat(obj.COMMODITY_ID, "&pageType=").concat(this.pageType)
});
}), (0, _defineProperty2.default)(_methods, "handleGoShopPage", function handleGoShopPage(obj, index) {
console.log("obj", obj);
console.log("index", index);
if (this.pageType === "UnionMall") {
// if (obj.UserdefinedType_Name === "工会活动") {
// uni.navigateTo({
// url: `/pages/allFunPage/unionActivities`,
// });
// } else {
uni.redirectTo({
url: "/pages/shopMallPage/shopType/index?leftId=".concat(obj.UserdefinedType_Id, "&pageType=").concat(this.pageType, "&selectIndex=").concat(index)
// url: `/pages/shopMallPage/shopType/index?pageType=${this.pageType}`,
});
// }
} else {
uni.redirectTo({
url: "/pages/shopMallPage/shopType/index?selectIndex=".concat(index, "&pageType=").concat(this.pageType)
});
}
}), (0, _defineProperty2.default)(_methods, "handleGoActivityType", function handleGoActivityType() {
uni.redirectTo({
url: "/pages/shopMallPage/shopType/index?selectIndex=".concat(0, "&pageType=", this.pageType)
});
}), (0, _defineProperty2.default)(_methods, "handleGoUnionMall", function handleGoUnionMall() {
uni.navigateTo({
url: "/pages/shopMallPage/index/index?pageType=UnionMall"
});
}), _methods)
};
exports.default = _default;
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))

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

File diff suppressed because one or more lines are too long

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

@ -1146,6 +1146,184 @@
right: -32vw;
top: 50%;
}
.main .pageContent .allShopList .advertisementSecond.data-v-79c11018 {
width: 100%;
margin-top: 24rpx;
display: flex;
justify-content: space-between;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem.data-v-79c11018 {
width: 100%;
height: 316rpx;
background: #fff;
border-radius: 14rpx;
box-sizing: border-box;
padding: 2rpx;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent.data-v-79c11018 {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 16rpx 22rpx;
background-image: url("https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/recommendation.png");
background-repeat: no-repeat;
background-size: 100% 100%;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent .contentTop.data-v-79c11018 {
width: 100%;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent .contentTop .title.data-v-79c11018 {
font-size: 14px;
font-weight: 600;
color: #181716;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent .contentTop .title .titleImg.data-v-79c11018 {
width: 112rpx;
height: 36rpx;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent .contentTop .moreBox.data-v-79c11018 {
display: flex;
align-items: center;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent .contentTop .moreBox .moreText.data-v-79c11018 {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #8b8280;
line-height: 36rpx;
text-align: left;
font-style: normal;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent .contentTop .moreBox .rightIcon.data-v-79c11018 {
width: 24rpx;
height: 24rpx;
margin-left: 4rpx;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent .contentTopUnionMall.data-v-79c11018 {
width: 100%;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent .contentTopUnionMall .title.data-v-79c11018 {
font-size: 26rpx;
font-weight: 600;
color: #181716;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent .shopDesc.data-v-79c11018 {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #8b8280;
line-height: 36rpx;
text-align: left;
font-style: normal;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent .shopItemList.data-v-79c11018 {
width: 100%;
height: 95px;
margin-top: 24rpx;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent .shopItemList .shopItem.data-v-79c11018 {
width: 136rpx;
display: inline-block;
margin-right: 24rpx;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent .shopItemList .shopItem .imgBox.data-v-79c11018 {
width: 136rpx;
height: 136rpx;
border-radius: 50%;
overflow: hidden;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent .shopItemList .shopItem .imgBox .shopImg.data-v-79c11018 {
width: 100%;
height: 100%;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent .shopItemList .shopItem .shopImgText.data-v-79c11018 {
display: inline-block;
width: 100%;
font-family: DINAlternate, DINAlternate;
font-weight: bold;
font-size: 28rpx;
color: #fe3f22;
line-height: 32rpx;
text-align: center;
font-style: normal;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent .shopItemList .shopItem .shopImgText .shopSmallText.data-v-79c11018 {
font-size: 24rpx;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItem .advertisementItemContent.data-v-79c11018 ::-webkit-scrollbar {
display: none;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItemUnionMall.data-v-79c11018 {
width: 100%;
background: #fff;
border-radius: 14rpx;
box-sizing: border-box;
padding: 2rpx;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItemUnionMall .advertisementItemContent.data-v-79c11018 {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 16rpx 22rpx;
background: linear-gradient(#ffefee 0%, #fffefe 100%) no-repeat;
background-size: 100% 176rpx;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItemUnionMall .advertisementItemContent .contentTopUnionMall.data-v-79c11018 {
width: 100%;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItemUnionMall .advertisementItemContent .contentTopUnionMall .title.data-v-79c11018 {
font-size: 26rpx;
font-weight: 600;
color: #181716;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItemUnionMall .advertisementItemContent .shopItemList.data-v-79c11018 {
width: 100%;
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItemUnionMall .advertisementItemContent .shopItemList .shopItem.data-v-79c11018 {
width: 20%;
height: 166rpx;
overflow: hidden;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItemUnionMall .advertisementItemContent .shopItemList .shopItem .imgBox.data-v-79c11018 {
width: 96rpx;
height: 96rpx;
display: flex;
align-items: center;
background-color: #f3f6f9;
border-radius: 50%;
justify-content: center;
font-size: 24rpx;
margin-bottom: 4rpx;
}
.main .pageContent .allShopList .advertisementSecond .advertisementItemUnionMall .advertisementItemContent .shopItemList .shopItem .imgText.data-v-79c11018 {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #130f05;
line-height: 36rpx;
text-align: left;
font-style: normal;
}
.main .priceRangeBox.data-v-79c11018 {
width: 100%;
height: 600rpx;

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

@ -567,11 +567,19 @@ var _default = {
if (res.confirm) {
item.count -= 1;
// 这里重复了先这样
console.log('item', JSON.parse(JSON.stringify(item)));
if (item.count === 0) {
var list = [];
_this.shopList.forEach(function (i) {
if (i.COMMODITY_CODE !== item.COMMODITY_CODE) {
list.push(i);
// 判断有没有多规格
if (item.RTCOMMODITY_MULTI_ID) {
if (i.RTCOMMODITY_MULTI_ID !== item.RTCOMMODITY_MULTI_ID) {
list.push(i);
}
} else {
if (i.COMMODITY_ID !== item.COMMODITY_ID) {
list.push(i);
}
}
});
_this.shopList = list;
@ -593,13 +601,20 @@ var _default = {
if (item.count === 0) {
var list = [];
this.shopList.forEach(function (i) {
if (i.COMMODITY_CODE !== item.COMMODITY_CODE) {
list.push(i);
if (item.RTCOMMODITY_MULTI_ID) {
if (i.RTCOMMODITY_MULTI_ID !== item.RTCOMMODITY_MULTI_ID) {
list.push(i);
}
} else {
if (i.COMMODITY_ID !== item.COMMODITY_ID) {
list.push(i);
}
}
});
this.shopList = list;
}
this.handleSum();
console.log(' this.shopList', this.shopList);
if (this.bigPageType === "UnionMall") {
this.$store.commit("unionMyShopCar", this.shopList);
} else {

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

File diff suppressed because one or more lines are too long

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

@ -1 +1 @@
<view class="main data-v-5eaf711b"><view class="topHeader data-v-5eaf711b" style="{{'padding-top:'+(menu.bottom+6+'px')+';'}}"><view class="headerTop data-v-5eaf711b" style="{{'top:'+(menu.top+(menu.height-24)/2+'px')+';'}}"><image class="backArrow data-v-5eaf711b" src="/static/images/home/backArrowWhite.svg" data-event-opts="{{[['tap',[['handleBackHome',['$event']]]]]}}" bindtap="__e"></image><text class="pageTitle data-v-5eaf711b">{{pageType==="UnionMall"?"工会之家":"我的"}}</text><view class="backArrow data-v-5eaf711b"></view></view></view><view class="userBox data-v-5eaf711b"><view class="userLeft data-v-5eaf711b"><image class="userImg data-v-5eaf711b" src="/static/images/home/defaultUser.svg"></image><view class="userDetail data-v-5eaf711b"><view class="userName data-v-5eaf711b">{{user.MEMBERSHIP_NAME}}</view><view class="userPhone data-v-5eaf711b">{{phone||""}}</view></view></view><view class="userRight data-v-5eaf711b"><image class="messageImg data-v-5eaf711b" src="/static/images/home/msg.svg"></image></view></view><view class="content data-v-5eaf711b"><view class="userOrder data-v-5eaf711b"><view class="orderTitle data-v-5eaf711b">我的订单</view><view class="orderList data-v-5eaf711b"><block wx:for="{{userOrderList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleGo',['$0'],[[['userOrderList','',index,'value']]]]]]]}}" class="orderItem data-v-5eaf711b" bindtap="__e"><image class="itemImg data-v-5eaf711b" src="{{item.src}}"></image><text class="itemText data-v-5eaf711b">{{item.label}}</text><text class="itemValue data-v-5eaf711b">{{item.value===1?Unpaid_Count:item.value===2?Deliver_Count:item.value===3?CheckOrder_Count:item.value===4?Complete_Count:""}}</text></view></block></view></view><view class="userOrder data-v-5eaf711b" style="margin-top:24rpx;"><view class="orderTitle data-v-5eaf711b">我的评价</view><view class="orderList data-v-5eaf711b"><block wx:for="{{evaluateList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goToEvaluate',['$0'],[[['evaluateList','',index,'value']]]]]]]}}" class="orderItem data-v-5eaf711b" bindtap="__e"><image class="itemImg data-v-5eaf711b" src="{{item.src}}"></image><text class="itemText data-v-5eaf711b">{{item.label}}</text><text class="itemValue data-v-5eaf711b">{{item.value===1?Comment_Count:item.value===2?Evaluated_Count:""}}</text></view></block></view></view><view class="userOrder data-v-5eaf711b"><view class="orderTitle data-v-5eaf711b">常用功能</view><view class="orderList data-v-5eaf711b"><view data-event-opts="{{[['tap',[['goAddressManager',['$event']]]]]}}" class="orderItem data-v-5eaf711b" bindtap="__e"><image class="itemImg data-v-5eaf711b" src="/static/images/home/wati_go.svg"></image><text class="itemText data-v-5eaf711b" style="font-size:24rpx;white-space:nowrap;">地址管理</text></view></view></view></view><shop-tabbar vue-id="773f334b-1" page="/pages/shopMallPage/user/index" pageType="{{pageType}}" shopCarLength="{{shopCarListCount}}" class="data-v-5eaf711b" bind:__l="__l"></shop-tabbar></view>
<view class="main data-v-5eaf711b"><view class="topHeader data-v-5eaf711b" style="{{'padding-top:'+(menu.bottom+6+'px')+';'}}"><view class="headerTop data-v-5eaf711b" style="{{'top:'+(menu.top+(menu.height-24)/2+'px')+';'}}"><image class="backArrow data-v-5eaf711b" src="/static/images/home/backArrowWhite.svg" data-event-opts="{{[['tap',[['handleBackHome',['$event']]]]]}}" bindtap="__e"></image><text class="pageTitle data-v-5eaf711b">{{pageType==="UnionMall"?"工会之家":"我的"}}</text><view class="backArrow data-v-5eaf711b"></view></view></view><view class="userBox data-v-5eaf711b"><view class="userLeft data-v-5eaf711b"><image class="userImg data-v-5eaf711b" src="/static/images/home/defaultUser.svg"></image><view class="userDetail data-v-5eaf711b"><view class="userName data-v-5eaf711b">{{user.MEMBERSHIP_NAME}}</view><view class="userPhone data-v-5eaf711b">{{phone||""}}</view></view></view></view><view class="content data-v-5eaf711b"><view class="userOrder data-v-5eaf711b"><view class="orderTitle data-v-5eaf711b">我的订单</view><view class="orderList data-v-5eaf711b"><block wx:for="{{userOrderList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleGo',['$0'],[[['userOrderList','',index,'value']]]]]]]}}" class="orderItem data-v-5eaf711b" bindtap="__e"><image class="itemImg data-v-5eaf711b" src="{{item.src}}"></image><text class="itemText data-v-5eaf711b">{{item.label}}</text><text class="itemValue data-v-5eaf711b">{{item.value===1?Unpaid_Count:item.value===2?Deliver_Count:item.value===3?CheckOrder_Count:item.value===4?Complete_Count:""}}</text></view></block></view></view><view class="userOrder data-v-5eaf711b" style="margin-top:24rpx;"><view class="orderTitle data-v-5eaf711b">我的评价</view><view class="orderList data-v-5eaf711b"><block wx:for="{{evaluateList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goToEvaluate',['$0'],[[['evaluateList','',index,'value']]]]]]]}}" class="orderItem data-v-5eaf711b" bindtap="__e"><image class="itemImg data-v-5eaf711b" src="{{item.src}}"></image><text class="itemText data-v-5eaf711b">{{item.label}}</text><text class="itemValue data-v-5eaf711b">{{item.value===1?Comment_Count:item.value===2?Evaluated_Count:""}}</text></view></block></view></view><view class="userOrder data-v-5eaf711b"><view class="orderTitle data-v-5eaf711b">常用功能</view><view class="orderList data-v-5eaf711b"><view data-event-opts="{{[['tap',[['goAddressManager',['$event']]]]]}}" class="orderItem data-v-5eaf711b" bindtap="__e"><image class="itemImg data-v-5eaf711b" src="/static/images/home/wati_go.svg"></image><text class="itemText data-v-5eaf711b" style="font-size:24rpx;white-space:nowrap;">地址管理</text></view></view></view></view><shop-tabbar vue-id="773f334b-1" page="/pages/shopMallPage/user/index" pageType="{{pageType}}" shopCarLength="{{shopCarListCount}}" class="data-v-5eaf711b" bind:__l="__l"></shop-tabbar></view>

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

@ -266,7 +266,8 @@ var _default = {
// 人数的具体
hideAgainIcon: true,
// 是否显示重新定位
isLoading: false
isLoading: false,
arriveTime: ""
};
},
components: {
@ -426,8 +427,11 @@ var _default = {
getTs: function getTs() {
this.active = 1;
this.type = 1000;
this.isPackage = 1000;
},
getRadio: function getRadio(item) {
console.log('itemitemitem', item);
// 就餐时间
// if (this.radio === item.value) {
// this.radio = ''
@ -451,12 +455,28 @@ var _default = {
this.phoneNumber = event.mp.detail.value;
},
bindTimeChange: function bindTimeChange(event) {
this.showTime = event.mp.detail.value;
var stime1 = this.showTime.split(":");
var stime2 = this.startT.split(":");
var st1 = 60 * Number(stime1[1]) + Number(stime1[0]) * 3600 - (60 * Number(stime2[1]) + Number(stime2[0]) * 3600);
this.radio = this.showTime;
this.radioType = st1 / 60;
var index = Number(event.detail.value);
var time = _timeRangeList.default[index];
if (time.indexOf('次日') === -1) {
this.radio = time;
this.showTime = time;
} else {
var day = this.$moment.now().format("YYYY-MM-DD");
this.radio = "".concat(day, " ").concat(time.split('次日')[1]);
this.showTime = time;
}
// console.log('eventeventevent', event);
// this.showTime = event.mp.detail.value;
// let stime1 = this.showTime.split(":");
// let stime2 = this.startT.split(":");
// let st1 =
// 60 * Number(stime1[1]) +
// Number(stime1[0]) * 3600 -
// (60 * Number(stime2[1]) + Number(stime2[0]) * 3600);
// this.radio = this.showTime;
// this.radioType = st1 / 60;
},
goCoupon: function goCoupon() {
uni.navigateTo({
@ -494,7 +514,8 @@ var _default = {
tableNumber: _this.tableNum || "",
takeType: _this.type,
packType: _this.isPackage,
reservationDate: _this.type === 2000 ? _this.radio : "",
// reservationDate: _this.type === 2000 ? _this.radio : "",
reservationDate: _this.type === 2000 ? _this.arriveTime : "",
orderPersonTel: _this.phoneNumber ? _this.phoneNumber : "",
couponCode: _this.couponAmount ? _this.couponPrice.CouponCode : "",
t_saleorderdetail: JSON.stringify(_this.shopOrder),
@ -899,12 +920,23 @@ var _default = {
console.log("arriveTime", arriveTime);
if (arriveTime) {
var nowTime = Date.now();
var nowDay = new Date().getDate();
console.log("nowDay", nowDay);
var arriveDate = new Date(nowTime + arriveTime * 1000);
var y = arriveDate.getFullYear();
var m = arriveDate.getMonth() + 1;
if (m < 10) {
m = '0' + m;
}
var day = arriveDate.getDate();
var hour = arriveDate.getHours();
var min = arriveDate.getMinutes();
console.log("day", day);
console.log("hour", hour);
console.log("min", min);
_this.beExpectedTo = "".concat(hour < 10 ? "0" + hour : hour, ":").concat(min < 10 ? "0" + min : min);
_this4.arriveTime = "".concat(y, "-").concat(m, "-").concat(day, " ").concat(hour, ":").concat(min);
console.log('this.arriveTime', _this4.arriveTime);
_this.beExpectedTo = "".concat(nowDay < day ? day - nowDay === 1 ? '次日' : "".concat(day - nowDay, "\u5929\u540E") : '').concat(hour < 10 ? "0" + hour : hour, ":").concat(min < 10 ? "0" + min : min);
}
},
fail: function fail(error) {}

2
unpackage/dist/dev/mp-weixin/pages/shopPages/settlementFood/index.wxml 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