update
This commit is contained in:
ylj20011123
parent
6e7fcc5604
commit
5636b8fd0d
2
App.vue
2
App.vue
@ -93,6 +93,8 @@ export default {
|
||||
// appId: "wx6a8173c6299c7a93",
|
||||
})
|
||||
.then(async (data) => {
|
||||
console.log('fdsfgaslkfs', data);
|
||||
|
||||
_this.$store.commit("setUser", data.Data);
|
||||
_this.user = data.Data;
|
||||
if (data.ResultCode === "100") {
|
||||
|
||||
@ -3,25 +3,15 @@
|
||||
<div class="content">
|
||||
<div class="contentTop">
|
||||
<span class="title">您对商品满意吗？</span>
|
||||
<checkbox
|
||||
class="anonymous"
|
||||
:checked="saveMsg.isAnonymous"
|
||||
color="#CAA97F"
|
||||
@change="isAnonymous($event, saveMsg)"
|
||||
>
|
||||
<checkbox class="anonymous" :checked="saveMsg.isAnonymous" color="#CAA97F"
|
||||
@change="isAnonymous($event, saveMsg)">
|
||||
<text>匿名评价</text>
|
||||
</checkbox>
|
||||
</div>
|
||||
<div class="starRate">
|
||||
<image
|
||||
class="shopImg"
|
||||
mode="aspectFit"
|
||||
lazy-load="true"
|
||||
:src="
|
||||
storeMsg.MERCHANTS_LOGO ||
|
||||
'https://eshangtech.com/ShopICO/no-picture.png'
|
||||
"
|
||||
/>
|
||||
<image class="shopImg" mode="aspectFit" lazy-load="true" :src="storeMsg.MERCHANTS_LOGO ||
|
||||
'https://eshangtech.com/ShopICO/no-picture.png'
|
||||
" />
|
||||
|
||||
<div class="rateBox">
|
||||
<div class="shopName">
|
||||
@ -32,26 +22,14 @@
|
||||
: 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"
|
||||
:disabled="detailObj.COMMENT_STATE === 1"
|
||||
:placeholder="
|
||||
saveMsg.merchantsId
|
||||
? '说说这家店的口味、环境、服务'
|
||||
: '商品满足你的期待吗？说说你的使用心得，分享给想买的他们吧'
|
||||
"
|
||||
v-model="saveMsg.commentContent"
|
||||
></textarea>
|
||||
<textarea cols="30" rows="5" :disabled="detailObj.COMMENT_STATE === 1" :placeholder="saveMsg.merchantsId
|
||||
? '说说这家店的口味、环境、服务'
|
||||
: '商品满足你的期待吗？说说你的使用心得，分享给想买的他们吧'
|
||||
" v-model="saveMsg.commentContent"></textarea>
|
||||
|
||||
<view class="tip-text"> 评价文字不可少于3字 </view>
|
||||
<view class="photo-box">
|
||||
@ -526,17 +504,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;
|
||||
@ -546,6 +527,7 @@ export default {
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
.anonymous {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
@ -563,6 +545,7 @@ export default {
|
||||
align-items: center;
|
||||
padding-bottom: 32rpx;
|
||||
border-bottom: 2rpx solid #f0f0f0;
|
||||
|
||||
.shopImg {
|
||||
width: 104rpx;
|
||||
height: 104rpx;
|
||||
@ -570,8 +553,10 @@ export default {
|
||||
overflow: hidden;
|
||||
margin-right: 24rpx;
|
||||
}
|
||||
|
||||
.rateBox {
|
||||
width: calc(100% - 130rpx);
|
||||
|
||||
.shopName {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
@ -590,6 +575,7 @@ export default {
|
||||
|
||||
.textBox {
|
||||
margin-top: 24px;
|
||||
|
||||
.photo-box {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -681,6 +667,7 @@ export default {
|
||||
box-sizing: border-box;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
|
||||
.submit {
|
||||
width: 100%;
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
@ -690,8 +677,8 @@ export default {
|
||||
line-height: 44rpx;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
background: #1890ff;
|
||||
border-radius: 6rpx;
|
||||
background: #07C160;
|
||||
border-radius: 48rpx;
|
||||
padding: 22rpx 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
<div class="content">{{ item.NOTICEINFO_CONTENT || "" }}</div>
|
||||
<div class="descBox">
|
||||
<span class="name">{{ item.author || item.STAFF_NAME || "-" }}</span>
|
||||
<span class="time">{{ item.publishTime || item.START_DATE || "-" }}</span>
|
||||
<span class="time">{{ item.publishTime || item.START_DATE || "" }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right">
|
||||
@ -39,6 +39,7 @@
|
||||
|
||||
<script>
|
||||
import { mapGetters } from "vuex";
|
||||
import { handleFormatDate } from '../../utils/publicMethods'
|
||||
import NoData from "../../components/noData.vue";
|
||||
export default {
|
||||
data() {
|
||||
@ -186,6 +187,7 @@ export default {
|
||||
let allRes = {}
|
||||
all.forEach((item) => {
|
||||
if (item.NOTICEINFO_TYPE && item.NOTICEINFO_STATE === 1) {
|
||||
item.START_DATE = handleFormatDate(item.START_DATE)
|
||||
if (typeList.indexOf(item.NOTICEINFO_TYPE) === -1) {
|
||||
typeList.push(item.NOTICEINFO_TYPE)
|
||||
let list = [item]
|
||||
@ -196,6 +198,7 @@ export default {
|
||||
allRes[item.NOTICEINFO_TYPE] = list
|
||||
}
|
||||
} else {
|
||||
item.publishTime = handleFormatDate(item.publishTime)
|
||||
typeList.push('ETC')
|
||||
let list = allRes['ETC']
|
||||
if (list && list.length > 0) {
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
? `url(https://eshangtech.com/minTestImg/springPageBg.png)`
|
||||
: `url(https://eshangtech.com/minTestImg/pageBg.png)`,
|
||||
}">
|
||||
<view class="topBox" :style="{
|
||||
<view class="topBox" :style="{
|
||||
height: menu.bottom + 14 + 'px',
|
||||
backgroundImage:
|
||||
pageType === 'spring'
|
||||
@ -788,7 +788,7 @@ export default {
|
||||
this.SCENICAREAOBJ = SCENICAREAOBJ
|
||||
|
||||
let req = {
|
||||
ProvinceCode: this.user.PROVINCE_CODE,
|
||||
ProvinceCode: "530000",
|
||||
latitude: latitude || this.seat.latitude || "",
|
||||
longitude: longitude || this.seat.longitude || "",
|
||||
ServerpartID: this.serviceDetail.SERVERPART_ID || "",
|
||||
@ -1217,6 +1217,8 @@ export default {
|
||||
method: "POST",
|
||||
success: (res) => {
|
||||
let list = res.data;
|
||||
console.log('充电', res);
|
||||
|
||||
let result = [];
|
||||
if (list && list.length > 0) {
|
||||
list.forEach((item) => {
|
||||
@ -1701,7 +1703,7 @@ export default {
|
||||
// 拿到最近的服务区数据
|
||||
async handleGetNearService(latitude, longitude) {
|
||||
let req = {
|
||||
Province_Code: this.user.PROVINCE_CODE || "530000",
|
||||
Province_Code: "530000",
|
||||
longitude: longitude,
|
||||
latitude: latitude,
|
||||
showservice: true,
|
||||
@ -1825,7 +1827,7 @@ export default {
|
||||
let newReq = {
|
||||
SearchParameter: {
|
||||
// NOTICEINFO_TYPES: 1010,
|
||||
PROVINCE_CODE: this.user.PROVINCE_CODE || "530000",
|
||||
PROVINCE_CODE: "530000",
|
||||
NOTICEINFO_STATE: 1,
|
||||
},
|
||||
PageIndex: 1,
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
<!-- 订单列表 -->
|
||||
<scroll-view :scroll-y="true" class="orderListBox"
|
||||
:style="{ height: `calc(100vh - ${menu.bottom}px - 42px - 35px - 35px)` }" @scrolltolower="handleScrollTolower">
|
||||
<view >
|
||||
<view>
|
||||
<!-- style="width:100% ;height: calc(100% - 30px);" -->
|
||||
<view class="orderItem" v-for="(item, index) in orderList" :key="index" @click="goEvaluate(item)">
|
||||
<view class="orderItemTop">
|
||||
@ -727,8 +727,8 @@ export default {
|
||||
margin-bottom: 16rpx;
|
||||
|
||||
.orderItemCenterLeft {
|
||||
width: 192rpx;
|
||||
height: 192rpx;
|
||||
width: 160rpx;
|
||||
height: 160rpx;
|
||||
margin-right: 12rpx;
|
||||
|
||||
.orderItemShopImg {
|
||||
@ -738,8 +738,8 @@ export default {
|
||||
}
|
||||
|
||||
.orderItemCenterRight {
|
||||
width: calc(100% - 192rpx - 12rpx);
|
||||
height: 192rpx;
|
||||
width: calc(100% - 160rpx - 12rpx);
|
||||
height: 160rpx;
|
||||
display: flex;
|
||||
|
||||
.orderItemCenterRightLeft {
|
||||
@ -748,7 +748,7 @@ export default {
|
||||
.orderItemRightLeftLabel {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
font-size: 24rpx;
|
||||
color: #333333;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
@ -779,7 +779,7 @@ export default {
|
||||
|
||||
.unitPrice {
|
||||
font-family: AppleSystemUIFont;
|
||||
font-size: 28rpx;
|
||||
font-size: 24rpx;
|
||||
color: #333333;
|
||||
line-height: 34rpx;
|
||||
text-align: left;
|
||||
@ -789,7 +789,7 @@ export default {
|
||||
|
||||
.orderItemQuantity {
|
||||
font-family: AppleSystemUIFont;
|
||||
font-size: 28rpx;
|
||||
font-size: 24rpx;
|
||||
color: #999999;
|
||||
line-height: 34rpx;
|
||||
text-align: left;
|
||||
@ -828,7 +828,7 @@ export default {
|
||||
.orderItemUnit {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
font-size: 24rpx;
|
||||
color: #333333;
|
||||
line-height: 40rpx;
|
||||
text-align: left;
|
||||
|
||||
@ -127,8 +127,8 @@
|
||||
</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="">
|
||||
<span>合计</span>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
</view>
|
||||
<view class="orderItemTopRight">
|
||||
<view class="statusBox">{{ fieldObj && item.OrderState && fieldObj[item.OrderState] ?
|
||||
fieldObj[item.OrderState]: "-" }}</view>
|
||||
fieldObj[item.OrderState] : "-" }}</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -333,7 +333,7 @@ export default {
|
||||
.statusBox {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
font-size: 24rpx;
|
||||
color: #F83D3D;
|
||||
line-height: 40rpx;
|
||||
text-align: right;
|
||||
@ -351,8 +351,8 @@ export default {
|
||||
margin-bottom: 16rpx;
|
||||
|
||||
.orderItemCenterLeft {
|
||||
width: 192rpx;
|
||||
height: 192rpx;
|
||||
width: 160rpx;
|
||||
height: 160rpx;
|
||||
margin-right: 12rpx;
|
||||
|
||||
.orderItemShopImg {
|
||||
@ -362,8 +362,8 @@ export default {
|
||||
}
|
||||
|
||||
.orderItemCenterRight {
|
||||
width: calc(100% - 192rpx - 12rpx);
|
||||
height: 192rpx;
|
||||
width: calc(100% - 160rpx - 12rpx);
|
||||
height: 160rpx;
|
||||
display: flex;
|
||||
|
||||
.orderItemCenterRightLeft {
|
||||
@ -372,7 +372,7 @@ export default {
|
||||
.orderItemRightLeftLabel {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
font-size: 24rpx;
|
||||
color: #333333;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
@ -403,7 +403,7 @@ export default {
|
||||
|
||||
.unitPrice {
|
||||
font-family: AppleSystemUIFont;
|
||||
font-size: 28rpx;
|
||||
font-size: 24rpx;
|
||||
color: #333333;
|
||||
line-height: 34rpx;
|
||||
text-align: left;
|
||||
@ -413,7 +413,7 @@ export default {
|
||||
|
||||
.orderItemQuantity {
|
||||
font-family: AppleSystemUIFont;
|
||||
font-size: 28rpx;
|
||||
font-size: 24rpx;
|
||||
color: #999999;
|
||||
line-height: 34rpx;
|
||||
text-align: left;
|
||||
@ -452,7 +452,7 @@ export default {
|
||||
.orderItemUnit {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
font-size: 24rpx;
|
||||
color: #333333;
|
||||
line-height: 40rpx;
|
||||
text-align: left;
|
||||
|
||||
@ -169,8 +169,8 @@
|
||||
</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="">
|
||||
<span>合计</span>
|
||||
|
||||
@ -109,6 +109,8 @@ export default {
|
||||
}),
|
||||
},
|
||||
onLoad(query) {
|
||||
console.log('this.userthis.userthis.user', this.user);
|
||||
|
||||
if (this.user.MEMBERSHIP_ID) {
|
||||
uni.switchTab({
|
||||
url: '/pages/index/index',
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
<view class="main">
|
||||
<view class="maintopBox">
|
||||
<view class="mainTopRight" @click="handleChangeSortType">
|
||||
<view class="distanceText">{{ sortType === 1 ? '按距离' : '按票价' }}</view>
|
||||
<!-- <view class="distanceText">{{ sortType === 1 ? '按距离' : '按票价' }}</view> -->
|
||||
<view class="distanceText">按票价</view>
|
||||
<image class="distanceIcon" src="https://eshangtech.com/caiyunyiImg/sortIcon.png" />
|
||||
</view>
|
||||
</view>
|
||||
@ -30,7 +31,7 @@
|
||||
</view>
|
||||
<view class="scenicBottom">
|
||||
<view class="scenicLeft">
|
||||
<image class="scenicIcon" src="https://eshangtech.com/caiyunyiImg/fixedIcon.png" />
|
||||
<image class="scenicIcon" src="/static/images/home/servicePosition.svg" />
|
||||
<view class="scenicLabel">距离{{ item.ScenicDistance || '-' }}km</view>
|
||||
</view>
|
||||
<view class="scenicRight" v-if="item.TICKET_PRICE > 0">
|
||||
@ -55,11 +56,12 @@ import { mapGetters } from "vuex";
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
sortType: 1,// 1:按距离，2:按票价
|
||||
sortType: 2,// 1:按距离，2:按票价 1：倒叙 2:正序
|
||||
dataList: [],// 表单数据
|
||||
seat: {},
|
||||
SCENICAREAOBJ: {},// 服务区类型的枚举
|
||||
pageIndex: 1
|
||||
pageIndex: 1,
|
||||
isOver: false,
|
||||
}
|
||||
},
|
||||
async onLoad() {
|
||||
@ -76,7 +78,7 @@ export default {
|
||||
}),
|
||||
},
|
||||
methods: {
|
||||
async handleGetData() {
|
||||
async handleGetData(sort) {
|
||||
let SCENICAREA = uni.getStorageSync("SCENICAREAOBJ");
|
||||
let SCENICAREAOBJ = {}
|
||||
uni.showLoading({
|
||||
@ -98,17 +100,20 @@ export default {
|
||||
|
||||
this.SCENICAREAOBJ = SCENICAREAOBJ
|
||||
|
||||
console.log('this.sortType', this.sortType);
|
||||
console.log('sortsortsort', sort);
|
||||
|
||||
|
||||
let req = {
|
||||
ProvinceCode: this.user.PROVINCE_CODE,
|
||||
latitude: this.seat.latitude || "",
|
||||
longitude: this.seat.longitude || "",
|
||||
SortStr: this.sortType === 1 ? '' : 'TICKET_PRICE desc',
|
||||
// SortStr: this.sortType === 1 ? 'ScenicDistance desc' : 'TICKET_PRICE desc',
|
||||
// ServerpartID: this.serviceDetail.SERVERPART_ID || "",
|
||||
type: 'encryption',
|
||||
PageIndex: this.pageIndex,
|
||||
PageSize: 20,
|
||||
SortStr: ""
|
||||
SortStr: `TICKET_PRICE${this.sortType === 1 ? ' desc' : ''}`
|
||||
}
|
||||
console.log('reqreqreqreq', req);
|
||||
|
||||
@ -117,7 +122,7 @@ export default {
|
||||
req
|
||||
);
|
||||
uni.hideLoading()
|
||||
console.log('景区数据 ', data);
|
||||
console.log('景区数据 ', data.Result_Data.List);
|
||||
let list = data.Result_Data.List
|
||||
let res = []
|
||||
if (list && list.length > 0) {
|
||||
@ -126,8 +131,19 @@ export default {
|
||||
res.push(item)
|
||||
}
|
||||
})
|
||||
if (list.length < 20) {
|
||||
this.isOver = true
|
||||
}
|
||||
} else {
|
||||
this.isOver = true
|
||||
}
|
||||
|
||||
if (sort) {
|
||||
this.dataList = []
|
||||
this.dataList = list
|
||||
} else {
|
||||
this.dataList = this.dataList.concat(list)
|
||||
}
|
||||
this.dataList = this.dataList.concat(list)
|
||||
},
|
||||
handleChangeSortType() {
|
||||
// 这里可以添加排序逻辑
|
||||
@ -136,10 +152,16 @@ export default {
|
||||
} else if (this.sortType === 2) {
|
||||
this.sortType = 1;
|
||||
}
|
||||
this.handleGetData()
|
||||
this.isOver = false
|
||||
this.pageIndex = 1
|
||||
// this.dataList = []
|
||||
this.handleGetData(true)
|
||||
},
|
||||
// 滑动到底部
|
||||
handleScrollBottom() {
|
||||
if (this.isOver) {
|
||||
return
|
||||
}
|
||||
console.log('滑动到底部滑动到底部滑动到底部');
|
||||
|
||||
this.pageIndex = this.pageIndex + 1
|
||||
@ -239,7 +261,7 @@ export default {
|
||||
.scenicName {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 600;
|
||||
font-size: 29rpx;
|
||||
font-size: 28rpx;
|
||||
color: #222222;
|
||||
line-height: 42rpx;
|
||||
text-align: left;
|
||||
@ -260,7 +282,7 @@ export default {
|
||||
.scenicType {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
font-size: 24rpx;
|
||||
color: #3D7FFF;
|
||||
line-height: 32rpx;
|
||||
text-align: right;
|
||||
@ -280,7 +302,7 @@ export default {
|
||||
.scenicRateText {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 20rpx;
|
||||
font-size: 24rpx;
|
||||
color: rgba(0, 0, 0, 0.6);
|
||||
line-height: 28rpx;
|
||||
text-align: left;
|
||||
@ -308,7 +330,7 @@ export default {
|
||||
.scenicLabel {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 20rpx;
|
||||
font-size: 24rpx;
|
||||
color: rgba(0, 0, 0, 0.6);
|
||||
line-height: 28rpx;
|
||||
text-align: left;
|
||||
@ -323,7 +345,7 @@ export default {
|
||||
.scenicRightLabel {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 20rpx;
|
||||
font-size: 24rpx;
|
||||
color: rgba(0, 0, 0, 0.6);
|
||||
line-height: 28rpx;
|
||||
text-align: left;
|
||||
@ -334,7 +356,7 @@ export default {
|
||||
.scenicUnit {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 20rpx;
|
||||
font-size: 24rpx;
|
||||
color: #F13216;
|
||||
line-height: 28rpx;
|
||||
text-align: left;
|
||||
|
||||
@ -634,7 +634,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>
|
||||
@ -692,7 +692,16 @@ export default {
|
||||
|
||||
await this.handleGetServerpartDetail(this.serverpart);
|
||||
await this.handleGetMerchant();
|
||||
await this.handleGetChargingStation(this.detailInfo);
|
||||
let idList = [1212, 1222, 1139, 1215];
|
||||
if (idList.indexOf(this.serverpart) !== -1) {
|
||||
await this.handleGetChargingStation(this.detailInfo);
|
||||
} else {
|
||||
this.chargingObj = {
|
||||
have: 0,
|
||||
use: 0,
|
||||
};
|
||||
}
|
||||
|
||||
await this.handleGetNearScenic()
|
||||
// this.$utils.addUserBehaviorNew();
|
||||
this.$utils.addUserBehaviorNew({
|
||||
@ -705,7 +714,15 @@ export default {
|
||||
this.serverpart = currentService.SERVERPART_ID;
|
||||
await this.handleGetServerpartDetail(this.serverpart);
|
||||
await this.handleGetMerchant();
|
||||
await this.handleGetChargingStation(this.detailInfo);
|
||||
let idList = [1212, 1222, 1139, 1215];
|
||||
if (idList.indexOf(this.serverpart) !== -1) {
|
||||
await this.handleGetChargingStation(this.detailInfo);
|
||||
} else {
|
||||
this.chargingObj = {
|
||||
have: 0,
|
||||
use: 0,
|
||||
};
|
||||
}
|
||||
await this.handleGetNearScenic()
|
||||
}
|
||||
},
|
||||
|
||||
@ -65,7 +65,8 @@
|
||||
: shopTypeList.length * 136 + 60 + 'rpx',
|
||||
}" -->
|
||||
<!-- 工会之家 -->
|
||||
<div class="rowBox" @click="handleGoUnionMall" v-if="pageType !== 'UnionMall'">
|
||||
<div class="rowBox" @click="handleGoUnionMall"
|
||||
v-if="pageType !== 'UnionMall' && user && user.INDUSTRY_MEMBERSHIP_ID">
|
||||
<!-- && user && user.INDUSTRY_MEMBERSHIP_ID -->
|
||||
<div class="imgBox">
|
||||
<div class="itemImgBox">
|
||||
|
||||
@ -138,10 +138,12 @@
|
||||
|
||||
<div class="bottom" :style="{ bottom: `${50 + safeHeight}px` }">
|
||||
<div class="bottomLeft" v-if="pageType === 'normal'">
|
||||
<radio :checked="isAllSelect" color="#4BCB7E" @click="handleAllSelect" />全选
|
||||
<radio :checked="isAllSelect" :color="bigPageType === 'UnionMall' ? '#E43C3D' : '#4BCB7E'"
|
||||
@click="handleAllSelect" />全选
|
||||
</div>
|
||||
<div class="bottomLeft" v-else>
|
||||
<radio :checked="isAllDelete" color="#4BCB7E" @click="handleAllDelete" />全选
|
||||
<radio :checked="isAllDelete" :color="bigPageType === 'UnionMall' ? '#E43C3D' : '#4BCB7E'"
|
||||
@click="handleAllDelete" />全选
|
||||
</div>
|
||||
<div class="bottomRight" v-if="pageType === 'normal'">
|
||||
<text class="sum">合计</text>
|
||||
|
||||
@ -30,7 +30,8 @@
|
||||
<div class="scrollBox">
|
||||
<!-- :style="{ width: (shopTypeList.length + 2) * 70 + 'px' }" -->
|
||||
|
||||
<div class="bigTabItem" @click="handleGoUnionMall" v-if="pageType !== 'UnionMall'">
|
||||
<div class="bigTabItem" @click="handleGoUnionMall"
|
||||
v-if="pageType !== 'UnionMall' && user && user.INDUSTRY_MEMBERSHIP_ID">
|
||||
<!-- && user && user.INDUSTRY_MEMBERSHIP_ID -->
|
||||
<!-- style="width: 70px" -->
|
||||
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
<template>
|
||||
<div class="remark">
|
||||
<div class="remark-content">
|
||||
<textarea
|
||||
placeholder="填写额外对商家备注的信息"
|
||||
v-model="remark"
|
||||
></textarea>
|
||||
<textarea placeholder="填写额外对商家备注的信息" v-model="remark"></textarea>
|
||||
</div>
|
||||
|
||||
<div class="comfirm-btn" @click="goOrder">确定</div>
|
||||
@ -71,13 +68,13 @@ bodyColor = #CAA97F;
|
||||
}
|
||||
|
||||
.comfirm-btn {
|
||||
border-radius: 4rpx;
|
||||
border-radius: 32rpx;
|
||||
height: 96rpx;
|
||||
width: 90%;
|
||||
margin: 0 auto;
|
||||
line-height: 96rpx;
|
||||
background: #333;
|
||||
color: bodyColor;
|
||||
background: #4BCB7E;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
|
||||
@ -29,14 +29,14 @@
|
||||
<div class="sellement-apponit-unit">
|
||||
<div class="time-title">就餐时间</div>
|
||||
<radio-group :value="radio" @change="onChangeRadio" class="radio-box bb1">
|
||||
<radio style="width: 60%" class="radio-list" color="#CAA97F" :name="beExpectedTo" checked-color="#CAA97F"
|
||||
<radio style="width: 60%" class="radio-list" color="#4BCB7E" :name="beExpectedTo" checked-color="#4BCB7E"
|
||||
@click="getRadio({ value: beExpectedTo })">
|
||||
<view class="section">
|
||||
<view class="picker">
|
||||
预计(
|
||||
<span style="color: red; font-size: 28rpx">{{
|
||||
beExpectedTo ? ` ${beExpectedTo}` : "-"
|
||||
}}</span>
|
||||
}}</span>
|
||||
)到达
|
||||
|
||||
<div style="padding-top: 10rpx">
|
||||
@ -46,7 +46,7 @@
|
||||
</view>
|
||||
</radio>
|
||||
|
||||
<radio style="width: 40%" class="radio-list" color="#CAA97F" :name="showTime" checked-color="#CAA97F"
|
||||
<radio style="width: 40%" class="radio-list" color="#4BCB7E" :name="showTime" checked-color="#4BCB7E"
|
||||
@click="getRadio({ value: showTime })">
|
||||
|
||||
<picker mode="selector" :range="timeRange" :value="time" @change="bindTimeChange">
|
||||
@ -85,7 +85,7 @@
|
||||
<div class="time-title">预约餐桌</div>
|
||||
<radio-group :value="board" @change="onChangeIsPackage" class="radio-box bb1">
|
||||
<view class="radio-list" v-for="(item, index) in boardList" :key="index">
|
||||
<radio :value="item.value" color="#CAA97F" @click="getBoard(item)" />
|
||||
<radio :value="item.value" color="#4BCB7E" @click="getBoard(item)" />
|
||||
<text class="radio-unit">{{ item.label }}</text>
|
||||
</view>
|
||||
</radio-group>
|
||||
@ -108,7 +108,7 @@
|
||||
<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">
|
||||
<radio :value="item.value" color="#CAA97F" @click="getPackge(item)" />
|
||||
<radio :value="item.value" color="#4BCB7E" @click="getPackge(item)" />
|
||||
<text class="radio-unit">{{ item.name }}</text>
|
||||
</view>
|
||||
</radio-group>
|
||||
|
||||
@ -1311,7 +1311,7 @@ export default {
|
||||
width: 2rem;
|
||||
height: 6rpx;
|
||||
// border-radius: 4px;
|
||||
background-color: #009DFF;
|
||||
background-color: #4BCB7E;
|
||||
bottom: 0;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
|
||||
@ -397,7 +397,7 @@
|
||||
> -->
|
||||
|
||||
<!-- 积分暂时没有规定 所以 -->
|
||||
<view class="rightBtn" v-if="good.PAY_METHOD !== 2000 && pageType !== 'pointsMall'">
|
||||
<view class="rightBtn" v-if="good.PAY_METHOD !== 2000 && pageType !== 'pointsMall' && !offShop">
|
||||
<div class="addCarBtn" @click="handleShowShopPopup(1)">加入购物车</div>
|
||||
<div class="sellOut presale" @click="handleShowShopPopup(4)" v-if="isCountdown">
|
||||
预售中
|
||||
@ -415,7 +415,7 @@
|
||||
</div>
|
||||
</view>
|
||||
|
||||
<view class="rightBtn" v-if="good.PAY_METHOD === 2000 || pageType === 'pointsMall'">
|
||||
<view class="rightBtn" v-if="(good.PAY_METHOD === 2000 || pageType === 'pointsMall') && !offShop">
|
||||
<div class="sellOut" style="width: 100%;border-radius: 16rpx;">
|
||||
积分不足
|
||||
</div>
|
||||
@ -447,6 +447,9 @@
|
||||
<div class="countdown" v-if="isCountdown || panicBuying">
|
||||
此商品为{{ panicBuying ? '热销' : '预售' }}商品，{{ panicBuying ? '抢购' : '起售' }}倒计时 {{ countdown || "" }}
|
||||
</div>
|
||||
|
||||
<!-- 商品下架显示 -->
|
||||
<div class="offShopDown" v-if="offShop">商品已下架！</div>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
@ -506,6 +509,7 @@ export default {
|
||||
timer: null, // 定时器
|
||||
isCollect: false,
|
||||
shopId: "",// 商品id
|
||||
offShop: false,// 判断商品是否下架了
|
||||
};
|
||||
},
|
||||
components: {
|
||||
@ -535,6 +539,9 @@ export default {
|
||||
|
||||
// 收藏
|
||||
async handleCollect() {
|
||||
|
||||
|
||||
|
||||
if (this.user && !this.user.MEMBERSHIP_ID || (!this.user && !this.user.MEMBERSHIP_ID)) {
|
||||
let _this = this;
|
||||
uni.showModal({
|
||||
@ -576,6 +583,10 @@ export default {
|
||||
})
|
||||
}
|
||||
} else {
|
||||
if (this.offShop) {
|
||||
return
|
||||
}
|
||||
|
||||
let req = {
|
||||
COLLECTION_ID: this.good.COLLECTION_ID || "",
|
||||
COLLECTION_TYPE: 2000,
|
||||
@ -1214,6 +1225,11 @@ export default {
|
||||
}
|
||||
|
||||
_this.good = res.Data;
|
||||
// 判断商品是否已经下架了 若当前时间大于 下架时间 就代表 已经下架了
|
||||
if (_this.good.OFF_DATE && new Date().getTime() > new Date(_this.good.OFF_DATE).getTime()) {
|
||||
_this.offShop = true
|
||||
}
|
||||
|
||||
_this.good.COMMODITY_CURRPRICE = _this.good.COMMODITY_MEMBERPRICE;
|
||||
_this.good.count = 1;
|
||||
_this.pageMsg.current = 0;
|
||||
@ -2422,6 +2438,26 @@ button:after {
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.offShopDown {
|
||||
width: 100%;
|
||||
height: 64rpx;
|
||||
background: #F5F6F7;
|
||||
position: fixed;
|
||||
z-index: 2;
|
||||
left: 0;
|
||||
bottom: 124rpx;
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #716F69;
|
||||
line-height: 32rpx;
|
||||
text-align: justify;
|
||||
font-style: normal;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.popup-box {
|
||||
padding: 50rpx 40rpx 32rpx;
|
||||
font-size: 28rpx;
|
||||
|
||||
@ -73,7 +73,7 @@ export default {
|
||||
methods: {
|
||||
async handleGetData() {
|
||||
let req = {
|
||||
ProvinceCode: this.user.PROVINCE_CODE,
|
||||
ProvinceCode: '530000',
|
||||
OwnerUnitId: 911,
|
||||
MemberShipId: this.user.MEMBERSHIP_ID,
|
||||
AppGuid: "wxee018fb96955552a",
|
||||
@ -82,6 +82,8 @@ export default {
|
||||
SortStr: this.sortType === 2 ? 'COMMODITY_MEMBERPRICE desc' : "",
|
||||
type: "encryption"
|
||||
}
|
||||
console.log('reqreqreqreq', req);
|
||||
|
||||
const data = await this.$api.$zzyLocalPost(
|
||||
"/Member/GetCommodityCollectionList",
|
||||
req
|
||||
|
||||
@ -469,7 +469,6 @@ export default {
|
||||
if (userInfoData.Result_Code === 100) {
|
||||
|
||||
let userData = uni.getStorageSync('userData')
|
||||
console.log('userDatauserDatauserData', userData);
|
||||
|
||||
if (userData) {
|
||||
uni.setStorageSync("userData", {
|
||||
|
||||
@ -471,7 +471,7 @@ export default {
|
||||
// 拿到设施的合计信息
|
||||
async handleGetSumObj (id) {
|
||||
const req = {
|
||||
ProvinceCode: 340000,
|
||||
ProvinceCode: 530000,
|
||||
ServerpartIds: id
|
||||
}
|
||||
const data = await this.$api.$get(
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
25
unpackage/dist/dev/mp-weixin/common/main.js
vendored
25
unpackage/dist/dev/mp-weixin/common/main.js
vendored
@ -210,33 +210,34 @@ var _default = {
|
||||
while (1) {
|
||||
switch (_context.prev = _context.next) {
|
||||
case 0:
|
||||
console.log('fdsfgaslkfs', data);
|
||||
_this.$store.commit("setUser", data.Data);
|
||||
_this.user = data.Data;
|
||||
if (!(data.ResultCode === "100")) {
|
||||
_context.next = 14;
|
||||
_context.next = 15;
|
||||
break;
|
||||
}
|
||||
_context.prev = 3;
|
||||
_context.next = 6;
|
||||
_context.prev = 4;
|
||||
_context.next = 7;
|
||||
return _this.getMember(data.Data);
|
||||
case 6:
|
||||
case 7:
|
||||
// 确保 getMember 完成
|
||||
resolve(data);
|
||||
_context.next = 12;
|
||||
_context.next = 13;
|
||||
break;
|
||||
case 9:
|
||||
_context.prev = 9;
|
||||
_context.t0 = _context["catch"](3);
|
||||
case 10:
|
||||
_context.prev = 10;
|
||||
_context.t0 = _context["catch"](4);
|
||||
reject(_context.t0);
|
||||
case 12:
|
||||
_context.next = 14;
|
||||
case 13:
|
||||
_context.next = 15;
|
||||
break;
|
||||
case 14:
|
||||
case 15:
|
||||
case "end":
|
||||
return _context.stop();
|
||||
}
|
||||
}
|
||||
}, _callee, null, [[3, 9]]);
|
||||
}, _callee, null, [[4, 10]]);
|
||||
}));
|
||||
return function (_x) {
|
||||
return _ref.apply(this, arguments);
|
||||
|
||||
13
unpackage/dist/dev/mp-weixin/common/vendor.js
vendored
13
unpackage/dist/dev/mp-weixin/common/vendor.js
vendored
@ -14915,6 +14915,7 @@ Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports.getDistanceBetweenCoordinates = getDistanceBetweenCoordinates;
|
||||
exports.handleFormatDate = handleFormatDate;
|
||||
exports.handleGetNearService = handleGetNearService;
|
||||
exports.handleHavePointInApp = handleHavePointInApp;
|
||||
exports.handleHavePointInMin = handleHavePointInMin;
|
||||
@ -15106,7 +15107,7 @@ function _handleGetNearService() {
|
||||
case 0:
|
||||
seatInfo = JSON.parse(uni.getStorageSync("seatInfo"));
|
||||
req = {
|
||||
Province_Code: "340000",
|
||||
Province_Code: "530000",
|
||||
longitude: longitude ? longitude : seatInfo.longitude ? seatInfo.longitude : '',
|
||||
latitude: latitude ? latitude : seatInfo.latitude ? seatInfo.latitude : ''
|
||||
};
|
||||
@ -15141,7 +15142,7 @@ function handleChangeServiceInfo(obj) {
|
||||
Distance: obj.SERVERPART_DISTANCE,
|
||||
OwnerUnitId: obj.OWNERUNIT_ID,
|
||||
OwnerUnitName: obj.OWNERUNIT_NAME,
|
||||
ProvinceCode: "340000",
|
||||
ProvinceCode: "530000",
|
||||
ServerPart_Id: obj.SERVERPART_ID,
|
||||
ServerPart_Name: obj.SERVERPART_NAME,
|
||||
ServerPart_Tel: "",
|
||||
@ -15265,6 +15266,14 @@ function _handleSaveOrderStore() {
|
||||
}));
|
||||
return _handleSaveOrderStore.apply(this, arguments);
|
||||
}
|
||||
function handleFormatDate(dateTimeStr) {
|
||||
if (!dateTimeStr) return '';
|
||||
var d = new Date(dateTimeStr.replace(/-/g, '/')); // 兼容 iOS
|
||||
var y = d.getFullYear();
|
||||
var m = String(d.getMonth() + 1).padStart(2, '0');
|
||||
var day = String(d.getDate()).padStart(2, '0');
|
||||
return "".concat(y, "-").concat(m, "-").concat(day);
|
||||
}
|
||||
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
|
||||
|
||||
/***/ }),
|
||||
|
||||
@ -160,8 +160,8 @@
|
||||
line-height: 44rpx;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
background: #1890ff;
|
||||
border-radius: 6rpx;
|
||||
background: #07C160;
|
||||
border-radius: 48rpx;
|
||||
padding: 22rpx 0;
|
||||
}
|
||||
.card.data-v-4496319b {
|
||||
|
||||
@ -166,6 +166,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
|
||||
var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
|
||||
var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
|
||||
var _vuex = __webpack_require__(/*! vuex */ 33);
|
||||
var _publicMethods = __webpack_require__(/*! ../../utils/publicMethods */ 60);
|
||||
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
||||
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
||||
var NoData = function NoData() {
|
||||
@ -341,6 +342,7 @@ var _default = {
|
||||
allRes = {};
|
||||
all.forEach(function (item) {
|
||||
if (item.NOTICEINFO_TYPE && item.NOTICEINFO_STATE === 1) {
|
||||
item.START_DATE = (0, _publicMethods.handleFormatDate)(item.START_DATE);
|
||||
if (typeList.indexOf(item.NOTICEINFO_TYPE) === -1) {
|
||||
typeList.push(item.NOTICEINFO_TYPE);
|
||||
var list = [item];
|
||||
@ -351,6 +353,7 @@ var _default = {
|
||||
allRes[item.NOTICEINFO_TYPE] = _list;
|
||||
}
|
||||
} else {
|
||||
item.publishTime = (0, _publicMethods.handleFormatDate)(item.publishTime);
|
||||
typeList.push('ETC');
|
||||
var _list2 = allRes['ETC'];
|
||||
if (_list2 && _list2.length > 0) {
|
||||
|
||||
@ -1 +1 @@
|
||||
<view class="main _div data-v-765f0f4e"><view class="tabBox _div data-v-765f0f4e"><block wx:for="{{tabList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleChangeTab',['$0'],[[['tabList','',index,'value']]]]]]]}}" class="{{['_div','data-v-765f0f4e',selectTab===item.value?'tabItem selectTabItem':'tabItem']}}" bindtap="__e">{{''+item.label+''}}</view></block></view><scroll-view class="contentList data-v-765f0f4e" scroll-y="{{true}}"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleGoDetail',['$0'],[[['allMessageList.'+selectTab+'','',index]]]]]]]}}" class="contentItem _div data-v-765f0f4e" bindtap="__e"><view class="left _div data-v-765f0f4e"><view class="title _div data-v-765f0f4e">{{item.$orig.title||item.$orig.NOTICEINFO_TITLE||""}}</view><view class="content _div data-v-765f0f4e">{{item.$orig.NOTICEINFO_CONTENT||""}}</view><view class="descBox _div data-v-765f0f4e"><label class="name _span data-v-765f0f4e">{{item.$orig.author||item.$orig.STAFF_NAME||"-"}}</label><label class="time _span data-v-765f0f4e">{{item.$orig.publishTime||item.$orig.START_DATE||"-"}}</label></view></view><view class="right _div data-v-765f0f4e"><block wx:if="{{item.g0}}"><image class="leftIcon data-v-765f0f4e" src="{{item.$orig.ImageList[0].ImageUrl}}" lazy-load="{{true}}"></image></block><block wx:else><image class="leftIcon data-v-765f0f4e" lazy-load="{{true}}" src="{{item.$orig.coverImg?item.$orig.coverImg:'https://eshangtech.com/ShopICO/no-picture.png'}}"></image></block></view></view></block><block wx:if="{{!$root.g1}}"><view class="_div data-v-765f0f4e"><no-data vue-id="55835b78-1" text="暂无内容" class="data-v-765f0f4e" bind:__l="__l"></no-data></view></block></scroll-view></view>
|
||||
<view class="main _div data-v-765f0f4e"><view class="tabBox _div data-v-765f0f4e"><block wx:for="{{tabList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleChangeTab',['$0'],[[['tabList','',index,'value']]]]]]]}}" class="{{['_div','data-v-765f0f4e',selectTab===item.value?'tabItem selectTabItem':'tabItem']}}" bindtap="__e">{{''+item.label+''}}</view></block></view><scroll-view class="contentList data-v-765f0f4e" scroll-y="{{true}}"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleGoDetail',['$0'],[[['allMessageList.'+selectTab+'','',index]]]]]]]}}" class="contentItem _div data-v-765f0f4e" bindtap="__e"><view class="left _div data-v-765f0f4e"><view class="title _div data-v-765f0f4e">{{item.$orig.title||item.$orig.NOTICEINFO_TITLE||""}}</view><view class="content _div data-v-765f0f4e">{{item.$orig.NOTICEINFO_CONTENT||""}}</view><view class="descBox _div data-v-765f0f4e"><label class="name _span data-v-765f0f4e">{{item.$orig.author||item.$orig.STAFF_NAME||"-"}}</label><label class="time _span data-v-765f0f4e">{{item.$orig.publishTime||item.$orig.START_DATE||""}}</label></view></view><view class="right _div data-v-765f0f4e"><block wx:if="{{item.g0}}"><image class="leftIcon data-v-765f0f4e" src="{{item.$orig.ImageList[0].ImageUrl}}" lazy-load="{{true}}"></image></block><block wx:else><image class="leftIcon data-v-765f0f4e" lazy-load="{{true}}" src="{{item.$orig.coverImg?item.$orig.coverImg:'https://eshangtech.com/ShopICO/no-picture.png'}}"></image></block></view></view></block><block wx:if="{{!$root.g1}}"><view class="_div data-v-765f0f4e"><no-data vue-id="55835b78-1" text="暂无内容" class="data-v-765f0f4e" bind:__l="__l"></no-data></view></block></scroll-view></view>
|
||||
@ -676,7 +676,7 @@ var _default = {
|
||||
case 12:
|
||||
_this5.SCENICAREAOBJ = SCENICAREAOBJ;
|
||||
req = {
|
||||
ProvinceCode: _this5.user.PROVINCE_CODE,
|
||||
ProvinceCode: "530000",
|
||||
latitude: latitude || _this5.seat.latitude || "",
|
||||
longitude: longitude || _this5.seat.longitude || "",
|
||||
ServerpartID: _this5.serviceDetail.SERVERPART_ID || "",
|
||||
@ -1160,6 +1160,7 @@ var _default = {
|
||||
method: "POST",
|
||||
success: function success(res) {
|
||||
var list = res.data;
|
||||
console.log('充电', res);
|
||||
var result = [];
|
||||
if (list && list.length > 0) {
|
||||
list.forEach(function (item) {
|
||||
@ -1687,7 +1688,7 @@ var _default = {
|
||||
switch (_context10.prev = _context10.next) {
|
||||
case 0:
|
||||
req = {
|
||||
Province_Code: _this17.user.PROVINCE_CODE || "530000",
|
||||
Province_Code: "530000",
|
||||
longitude: longitude,
|
||||
latitude: latitude,
|
||||
showservice: true,
|
||||
@ -1820,7 +1821,7 @@ var _default = {
|
||||
newReq = {
|
||||
SearchParameter: {
|
||||
// NOTICEINFO_TYPES: 1010,
|
||||
PROVINCE_CODE: _this18.user.PROVINCE_CODE || "530000",
|
||||
PROVINCE_CODE: "530000",
|
||||
NOTICEINFO_STATE: 1
|
||||
},
|
||||
PageIndex: 1,
|
||||
|
||||
@ -190,8 +190,8 @@
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
.main .orderListBox .orderItem .orderItemCenter .orderItemCenterLeft.data-v-50f48f45 {
|
||||
width: 192rpx;
|
||||
height: 192rpx;
|
||||
width: 160rpx;
|
||||
height: 160rpx;
|
||||
margin-right: 12rpx;
|
||||
}
|
||||
.main .orderListBox .orderItem .orderItemCenter .orderItemCenterLeft .orderItemShopImg.data-v-50f48f45 {
|
||||
@ -199,8 +199,8 @@
|
||||
height: 100%;
|
||||
}
|
||||
.main .orderListBox .orderItem .orderItemCenter .orderItemCenterRight.data-v-50f48f45 {
|
||||
width: calc(100% - 192rpx - 12rpx);
|
||||
height: 192rpx;
|
||||
width: calc(100% - 160rpx - 12rpx);
|
||||
height: 160rpx;
|
||||
display: flex;
|
||||
}
|
||||
.main .orderListBox .orderItem .orderItemCenter .orderItemCenterRight .orderItemCenterRightLeft.data-v-50f48f45 {
|
||||
@ -209,7 +209,7 @@
|
||||
.main .orderListBox .orderItem .orderItemCenter .orderItemCenterRight .orderItemCenterRightLeft .orderItemRightLeftLabel.data-v-50f48f45 {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
font-size: 24rpx;
|
||||
color: #333333;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
@ -237,7 +237,7 @@
|
||||
}
|
||||
.main .orderListBox .orderItem .orderItemCenter .orderItemCenterRight .orderItemCenterRightRight .unitPrice.data-v-50f48f45 {
|
||||
font-family: AppleSystemUIFont;
|
||||
font-size: 28rpx;
|
||||
font-size: 24rpx;
|
||||
color: #333333;
|
||||
line-height: 34rpx;
|
||||
text-align: left;
|
||||
@ -246,7 +246,7 @@
|
||||
}
|
||||
.main .orderListBox .orderItem .orderItemCenter .orderItemCenterRight .orderItemCenterRightRight .orderItemQuantity.data-v-50f48f45 {
|
||||
font-family: AppleSystemUIFont;
|
||||
font-size: 28rpx;
|
||||
font-size: 24rpx;
|
||||
color: #999999;
|
||||
line-height: 34rpx;
|
||||
text-align: left;
|
||||
@ -276,7 +276,7 @@
|
||||
.main .orderListBox .orderItem .orderItemMoneyBox .orderItemUnit.data-v-50f48f45 {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
font-size: 24rpx;
|
||||
color: #333333;
|
||||
line-height: 40rpx;
|
||||
text-align: left;
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -176,6 +176,7 @@ var _default = {
|
||||
InviteCode: "InviteCode"
|
||||
})),
|
||||
onLoad: function onLoad(query) {
|
||||
console.log('this.userthis.userthis.user', this.user);
|
||||
if (this.user.MEMBERSHIP_ID) {
|
||||
uni.switchTab({
|
||||
url: '/pages/index/index'
|
||||
|
||||
@ -265,6 +265,7 @@ var _default = {
|
||||
onLoad: function onLoad(query) {
|
||||
var _this2 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
|
||||
var idList;
|
||||
return _regenerator.default.wrap(function _callee$(_context) {
|
||||
while (1) {
|
||||
switch (_context.prev = _context.next) {
|
||||
@ -283,17 +284,30 @@ var _default = {
|
||||
_context.next = 8;
|
||||
return _this2.handleGetMerchant();
|
||||
case 8:
|
||||
_context.next = 10;
|
||||
return _this2.handleGetChargingStation(_this2.detailInfo);
|
||||
case 10:
|
||||
idList = [1212, 1222, 1139, 1215];
|
||||
if (!(idList.indexOf(_this2.serverpart) !== -1)) {
|
||||
_context.next = 14;
|
||||
break;
|
||||
}
|
||||
_context.next = 12;
|
||||
return _this2.handleGetNearScenic();
|
||||
return _this2.handleGetChargingStation(_this2.detailInfo);
|
||||
case 12:
|
||||
_context.next = 15;
|
||||
break;
|
||||
case 14:
|
||||
_this2.chargingObj = {
|
||||
have: 0,
|
||||
use: 0
|
||||
};
|
||||
case 15:
|
||||
_context.next = 17;
|
||||
return _this2.handleGetNearScenic();
|
||||
case 17:
|
||||
// this.$utils.addUserBehaviorNew();
|
||||
_this2.$utils.addUserBehaviorNew({
|
||||
behaviorRecordDesc: "\u67E5\u770B\u4E86".concat(_this2.detailInfo.SERVERPART_NAME, "\u8BE6\u60C5")
|
||||
});
|
||||
case 13:
|
||||
case 18:
|
||||
case "end":
|
||||
return _context.stop();
|
||||
}
|
||||
@ -304,14 +318,14 @@ var _default = {
|
||||
onShow: function onShow() {
|
||||
var _this3 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
|
||||
var currentService;
|
||||
var currentService, idList;
|
||||
return _regenerator.default.wrap(function _callee2$(_context2) {
|
||||
while (1) {
|
||||
switch (_context2.prev = _context2.next) {
|
||||
case 0:
|
||||
currentService = uni.getStorageSync("currentService");
|
||||
if (_this3.serverpart) {
|
||||
_context2.next = 11;
|
||||
_context2.next = 16;
|
||||
break;
|
||||
}
|
||||
_this3.serverpart = currentService.SERVERPART_ID;
|
||||
@ -321,12 +335,25 @@ var _default = {
|
||||
_context2.next = 7;
|
||||
return _this3.handleGetMerchant();
|
||||
case 7:
|
||||
_context2.next = 9;
|
||||
return _this3.handleGetChargingStation(_this3.detailInfo);
|
||||
case 9:
|
||||
idList = [1212, 1222, 1139, 1215];
|
||||
if (!(idList.indexOf(_this3.serverpart) !== -1)) {
|
||||
_context2.next = 13;
|
||||
break;
|
||||
}
|
||||
_context2.next = 11;
|
||||
return _this3.handleGetNearScenic();
|
||||
return _this3.handleGetChargingStation(_this3.detailInfo);
|
||||
case 11:
|
||||
_context2.next = 14;
|
||||
break;
|
||||
case 13:
|
||||
_this3.chargingObj = {
|
||||
have: 0,
|
||||
use: 0
|
||||
};
|
||||
case 14:
|
||||
_context2.next = 16;
|
||||
return _this3.handleGetNearScenic();
|
||||
case 16:
|
||||
case "end":
|
||||
return _context2.stop();
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -227,7 +227,7 @@
|
||||
content: "";
|
||||
width: 2rem;
|
||||
height: 6rpx;
|
||||
background-color: #009DFF;
|
||||
background-color: #4BCB7E;
|
||||
bottom: 0;
|
||||
left: 50%;
|
||||
-webkit-transform: translateX(-50%);
|
||||
|
||||
@ -147,6 +147,7 @@ var render = function () {
|
||||
var g6 =
|
||||
_vm.good.PAY_METHOD !== 2000 &&
|
||||
_vm.pageType !== "pointsMall" &&
|
||||
!_vm.offShop &&
|
||||
_vm.good.OFF_DATE &&
|
||||
!_vm.isCountdown
|
||||
? new Date().getTime()
|
||||
@ -154,12 +155,15 @@ var render = function () {
|
||||
var g7 =
|
||||
_vm.good.PAY_METHOD !== 2000 &&
|
||||
_vm.pageType !== "pointsMall" &&
|
||||
!_vm.offShop &&
|
||||
_vm.good.OFF_DATE &&
|
||||
!_vm.isCountdown
|
||||
? new Date(_vm.good.OFF_DATE).getTime()
|
||||
: null
|
||||
var g8 =
|
||||
_vm.good.PAY_METHOD !== 2000 && _vm.pageType !== "pointsMall"
|
||||
_vm.good.PAY_METHOD !== 2000 &&
|
||||
_vm.pageType !== "pointsMall" &&
|
||||
!_vm.offShop
|
||||
? new Date().getTime() > new Date(_vm.good.OFF_DATE).getTime() &&
|
||||
!(_vm.good.OFF_DATE && !_vm.isCountdown)
|
||||
: null
|
||||
@ -293,7 +297,9 @@ var _default = {
|
||||
timer: null,
|
||||
// 定时器
|
||||
isCollect: false,
|
||||
shopId: "" // 商品id
|
||||
shopId: "",
|
||||
// 商品id
|
||||
offShop: false // 判断商品是否下架了
|
||||
};
|
||||
},
|
||||
|
||||
@ -370,9 +376,15 @@ var _default = {
|
||||
icon: 'none'
|
||||
});
|
||||
}
|
||||
_context.next = 31;
|
||||
_context.next = 33;
|
||||
break;
|
||||
case 16:
|
||||
if (!_this2.offShop) {
|
||||
_context.next = 18;
|
||||
break;
|
||||
}
|
||||
return _context.abrupt("return");
|
||||
case 18:
|
||||
_req = {
|
||||
COLLECTION_ID: _this2.good.COLLECTION_ID || "",
|
||||
COLLECTION_TYPE: 2000,
|
||||
@ -388,13 +400,13 @@ var _default = {
|
||||
OPERATE_DATE: _this2.$moment.now().format("YYYY-MM-DD")
|
||||
}; // 同步收藏
|
||||
console.log('reqreqreq', _req);
|
||||
_context.next = 20;
|
||||
_context.next = 22;
|
||||
return _this2.$api.$zzyLocalPost("/Member/SynchroCOLLECTION", _req);
|
||||
case 20:
|
||||
case 22:
|
||||
_data = _context.sent;
|
||||
console.log('data', _data);
|
||||
if (!(_data.Result_Code === 100)) {
|
||||
_context.next = 30;
|
||||
_context.next = 32;
|
||||
break;
|
||||
}
|
||||
uni.showToast({
|
||||
@ -402,18 +414,18 @@ var _default = {
|
||||
icon: 'none'
|
||||
});
|
||||
_this2.isCollect = true;
|
||||
_context.next = 27;
|
||||
_context.next = 29;
|
||||
return _this2.getDetail(_this2.good.COMMODITY_ID);
|
||||
case 27:
|
||||
case 29:
|
||||
_this2.$forceUpdate();
|
||||
_context.next = 31;
|
||||
_context.next = 33;
|
||||
break;
|
||||
case 30:
|
||||
case 32:
|
||||
uni.showToast({
|
||||
title: _data.Result_Desc,
|
||||
icon: 'none'
|
||||
});
|
||||
case 31:
|
||||
case 33:
|
||||
case "end":
|
||||
return _context.stop();
|
||||
}
|
||||
@ -999,6 +1011,10 @@ var _default = {
|
||||
_this.isCollect = true;
|
||||
}
|
||||
_this.good = res.Data;
|
||||
// 判断商品是否已经下架了 若当前时间大于 下架时间 就代表 已经下架了
|
||||
if (_this.good.OFF_DATE && new Date().getTime() > new Date(_this.good.OFF_DATE).getTime()) {
|
||||
_this.offShop = true;
|
||||
}
|
||||
_this.good.COMMODITY_CURRPRICE = _this.good.COMMODITY_MEMBERPRICE;
|
||||
_this.good.count = 1;
|
||||
_this.pageMsg.current = 0;
|
||||
@ -1050,7 +1066,7 @@ var _default = {
|
||||
_this.panicBuying = false;
|
||||
}
|
||||
}
|
||||
case 25:
|
||||
case 26:
|
||||
case "end":
|
||||
return _context3.stop();
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -526,6 +526,25 @@ button.data-v-0dc4ca38:after {
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.offShopDown.data-v-0dc4ca38 {
|
||||
width: 100%;
|
||||
height: 64rpx;
|
||||
background: #F5F6F7;
|
||||
position: fixed;
|
||||
z-index: 2;
|
||||
left: 0;
|
||||
bottom: 124rpx;
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #716F69;
|
||||
line-height: 32rpx;
|
||||
text-align: justify;
|
||||
font-style: normal;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.popup-box.data-v-0dc4ca38 {
|
||||
padding: 50rpx 40rpx 32rpx;
|
||||
font-size: 28rpx;
|
||||
|
||||
@ -471,7 +471,7 @@ export default {
|
||||
// 拿到设施的合计信息
|
||||
async handleGetSumObj (id) {
|
||||
const req = {
|
||||
ProvinceCode: 340000,
|
||||
ProvinceCode: 530000,
|
||||
ServerpartIds: id
|
||||
}
|
||||
const data = await this.$api.$get(
|
||||
|
||||
@ -147,7 +147,7 @@ export async function handleGetNearService(_this, longitude, latitude) {
|
||||
|
||||
let seatInfo = JSON.parse(uni.getStorageSync("seatInfo"));
|
||||
let req = {
|
||||
Province_Code: "340000",
|
||||
Province_Code: "530000",
|
||||
longitude: longitude ? longitude : seatInfo.longitude ? seatInfo.longitude : '',
|
||||
latitude: latitude ? latitude : seatInfo.latitude ? seatInfo.latitude : '',
|
||||
};
|
||||
@ -174,7 +174,7 @@ function handleChangeServiceInfo(obj) {
|
||||
Distance: obj.SERVERPART_DISTANCE,
|
||||
OwnerUnitId: obj.OWNERUNIT_ID,
|
||||
OwnerUnitName: obj.OWNERUNIT_NAME,
|
||||
ProvinceCode: "340000",
|
||||
ProvinceCode: "530000",
|
||||
ServerPart_Id: obj.SERVERPART_ID,
|
||||
ServerPart_Name: obj.SERVERPART_NAME,
|
||||
ServerPart_Tel: "",
|
||||
@ -295,3 +295,11 @@ export async function handleSaveOrderStore() {
|
||||
uni.setStorageSync("foodOrderStatus", foodOrderCountList)
|
||||
}
|
||||
|
||||
export function handleFormatDate(dateTimeStr) {
|
||||
if (!dateTimeStr) return '';
|
||||
const d = new Date(dateTimeStr.replace(/-/g, '/')); // 兼容 iOS
|
||||
const y = d.getFullYear();
|
||||
const m = String(d.getMonth() + 1).padStart(2, '0');
|
||||
const day = String(d.getDate()).padStart(2, '0');
|
||||
return `${y}-${m}-${day}`;
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user