product_platform/yxt-yythmall-ui-miniprogram
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

111111

Browse Source
This commit is contained in:
guoxing
2024-02-04 11:31:30 +08:00
parent cf39946c0b
commit 2ba9d8bba9
8 changed files with 143 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/request.api.js
View File

@@ -158,6 +158,6 @@ export default {
// 我的菜窖 预约提菜 选择时间范围
getExtractSaturAndSun: (params = {}) => request.get("/customerstore/isSaturAndSun", params),
// 我的菜窖 保存预约提菜
submissionExtract: (params = {}) => request.post("/lpksreservoorders/submission", params),
submissionExtract: (params = {}) => request.post("/lpksreservoorders/submission", params, {}, {}, true),
}

5
pages/good/shoppCart.vue
View File

@@ -85,9 +85,10 @@
，{{page.qssl}}斤起订。</view>
<view style="display: flex;flex-direction: row;align-items: center;" @click="showPop()">
<text
style="color: #6190D8;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;text-decoration:underline;font-style:oblique;">
style="color: #6190D8;font-size: 13px;height: 10px;line-height: 10px;margin-top: 5px;text-decoration:underline;font-style:oblique;">
起订说明</text>
<text style="color: #6190D8;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;">
<text
style="color: #6190D8;font-size: 13px;height: 10px;line-height: 10px;margin-top: 5px;margin-left: 2px;">
>></text>
</view>
</view>

4
pages/home/cloudCard2.vue
View File

@@ -162,10 +162,10 @@
<view style="display: flex;flex-direction: row;align-items: center;"
@click="showPop2()">
<text
style="color: #6190D8;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;text-decoration:underline;font-style:oblique;">
style="color: #6190D8;font-size: 13px;height: 10px;line-height: 10px;margin-top: 5px;text-decoration:underline;font-style:oblique;">
起订说明</text>
<text
style="color: #6190D8;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;">
style="color: #6190D8;font-size: 13px;height: 10px;line-height: 10px;margin-top: 5px;margin-left: 2px;">
>></text>
</view>

5
pages/home/myHome.vue
View File

@@ -149,8 +149,7 @@
<view v-for="(child,pos) in recommend.vos" :key="pos" @click="recommendClick(child)"
style="display: flex;flex-direction: column;width: 100%;box-sizing: border-box;">
<text style="color: #424242; font-size: 13px;line-height: 25px;">*
{{child.remarks}}</text>
<text style="color: #424242; font-size: 13px;line-height: 25px;">*{{child.remarks}}</text>
</view>
@@ -221,7 +220,7 @@
methods: {
makePhoneCall() {
wx.makePhoneCall({
phoneNumber: '15503115233',
phoneNumber: '15632127890',
})
},

29
pages/records/orderDetail.vue
View File

@@ -139,10 +139,10 @@
return {
page: {
sid: "",
countdown: ""
countdown: "",
nowDate: ""
},
data: {
}
data: {}
}
},
onLoad(options) {
@@ -158,6 +158,7 @@
_this.$api.orderDetails(_this.page.sid).then((resp) => {
_this.data = resp
_this.page.nowDate = resp.nowDate
_this.countTime() // 倒计时
_this.$nextTick(() => {
_this.$refs.pageView.setLoadState(2)
@@ -175,7 +176,7 @@
var mm = list[0] // 获取分钟数
var ss = list[1] // 获取秒数
var totalSeconds = Number(mm)*60+ Number(ss)
var totalSeconds = Number(mm) * 60 + Number(ss)
this.data.result.remainder = totalSeconds
// console.log("==============",this.data.result.remainder);
@@ -183,12 +184,17 @@
},
countTime() {
var that = this;
var date = new Date();
var now = date.getTime();
// var date = new Date();
// var now = date.getTime();
// var now = that.data.nowDate;
// console.log("now", that.page.nowDate);
var endDate = new Date(that.data.endTime); //设置截止时间
var end = endDate.getTime();
var leftTime = end - now; //时间差
// console.log("end", end);
var leftTime = end - that.page.nowDate; //时间差
var d, h, m, s, ms;
// console.log("leftTime", leftTime);
if (leftTime >= 0) {
d = Math.floor(leftTime / 1000 / 60 / 60 / 24);
h = Math.floor(leftTime / 1000 / 60 / 60 % 24);
@@ -199,20 +205,18 @@
s = s < 10 ? "0" + s : s
m = m < 10 ? "0" + m : m
h = h < 10 ? "0" + h : h
that.page.countdown = m + ":" + s,
that.page.countdown = m + ":" + s
//递归每秒调用countTime方法，显示动态时间效果
that.page.nowDate = that.page.nowDate + 1000
setTimeout(that.countTime, 1000);
} else {
that.page.countdown = '00:00:00'
that.data.payStatus = '3'
that.changePayState()
}
},
changePayState() {
let _this = this
_this.$api.changePayState(_this.page.sid).then((resp) => {
}).catch(e => {
@@ -220,8 +224,9 @@
})
}
}
}
</script>

84
pages/records/reservationRecords3.vue
View File

@@ -5,29 +5,35 @@
<!-- 有列表的时候用 :auto='false' 需要你在onload等调用reload方法 -->
<z-paging ref="paging" v-model="data" @query="queryList" :pagingStyle='styleObject' :auto='true'>
<view v-for="(item,index) in data" style=" display: flex;flex-direction: column;margin-left: 10px;margin-right: 10px;background: #FFF7EA;margin-top: 10px;
padding: 10px 20px;
border-radius: 20px;">
<view v-for="(item,index) in data" style=" display: flex;flex-direction: column;margin-left: 10px;margin-right: 10px;background: #FBE9CB;margin-top: 10px;
padding: 12px 0px;
border-radius: 15px;">
<view class="item">
<view class="left-circle"></view>
<!-- <view class="left-circle"></view>
<view class="right-circle"></view>
<view class="item-line"></view>
<view class="item-line"></view> -->
<view class="item-top">
<view class="item-top" style="margin-left: 16px;margin-right: 16px;">
<text class="item-top-code">预约单号：{{item.reserveCode}}</text>
<text class="item-top-state">{{item.stateValue}}</text>
</view>
<view class="item-bom">
<view style="display: flex;flex-direction: row;align-items: center;margin-left: 16px;margin-right: 16px;margin-top: 15px;">
<text style="font-size: 16px;margin-right: 8px;flex: 1;margin-right: 10px;">{{item.storeName}}</text>
</view>
<view class="item-bom" style="margin-left: 16px;margin-right: 16px;">
<view class="item-bom-left">
<view style="display: flex;flex-direction: row;align-items: center;">
<text style="font-size: 16px;margin-right: 5px;">{{item.storeName}}</text>
<image src="../../static/phone-2.png" style="width: 15px;height: 15px;"
@click="makePhoneCall(item.linkPhone)"></image>
<view style="display: flex;flex-direction: row;align-items: center;" @click="makePhoneCall(item.linkPhone)">
<image src="../../static/phone-2.png" style="width: 20px;height: 20px;margin-right: 5px;"></image>
<text>咨询电话</text>
</view>
<!-- <view style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
@@ -37,7 +43,7 @@
<text style="font-size: 12px;color: #FF5006;">{{item.date}}</text>
</view> -->
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 20px;">
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 16px;">
<text style="font-size: 12px;color: #999; margin-right: 5px;">提菜人：</text>
<text style="font-size: 12px;color: #333; margin-right: 5px;">{{item.userName}}</text>
<text style="font-size: 12px;color: #333; ">{{item.userPhone}}</text>
@@ -54,20 +60,28 @@
<view class="item-bom_right">
<image src="https://supervise.yxtsoft.com/lpk/image/daiticai.png"
style="width: 100px; height: 100px;z-index: 100;">
style="width: 104px; height: 104px;z-index: 100;border-radius: 20px;">
</image>
</view>
</view>
<view class="item_list" v-if="item.showLsit">
<view style="
height: 30px;margin-top: 5px;">
<image src="https://supervise.yxtsoft.com/lpk/image/reservationRecords_icon1.png"
style="width: 100%;height: 100%;" mode="scaleToFill"></image>
</view>
<view class="item_list" v-if="item.showLsit" style="margin-left: 16px;margin-right: 16px;">
<view v-for="(child,index) in item.goodsVo"
style="display: flex;flex-direction: row;width: 100%;">
<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;width: 100%;
padding-left: 10px;padding-right: 10px;margin-top: 8px;">
padding-left: 10px;padding-right: 10px;margin-bottom: 8px;">
<text style="font-size: 12px;color: #666;">{{child.goodName}}</text>
<text style="font-size: 12px;color: #666;">{{child.num}}{{child.unitName}}</text>
</view>
@@ -101,7 +115,7 @@
'padding-top': '10px',
'padding-bottom': '10px',
'border-radius': '15px',
'background': '#f2f2f2'
'background': '#F9F9F9'
},
data: []
}
@@ -156,37 +170,45 @@
.item {
position: relative;
box-sizing: border-box;
display: flex;
box-sizing: border-box;
flex-direction: column;
// /*最重要的部分如下：*/
// background-image: radial-gradient(circle at left 50%, #f2f2f2, #f2f2f2 12px, transparent 12px),
// radial-gradient(circle at right 50%, #f2f2f2, #f2f2f2 12px, transparent 12px);
.item-line {
width: 100%;
border-bottom: 10rpx dashed #fff;
width: 96%;
display: flex;
flex-direction: row;
box-sizing: border-box;
margin-left: 7px;
margin-right: 7px;
border-bottom: 2rpx dashed #f0f;
position: absolute;
height: 20rpx;
top: 50%;
top: 150px;
}
.left-circle {
background-color: var(--bgcolor);
position: absolute;
width: 40rpx;
height: 40rpx;
width: 50rpx;
height: 50rpx;
border-radius: 50%;
top: 50%;
left: -50rpx;
top: 150px;
left: -50px;
}
.right-circle {
background-color: var(--bgcolor);
position: absolute;
width: 40rpx;
height: 40rpx;
width: 50rpx;
height: 50rpx;
border-radius: 50%;
top: 50%;
right: -50rpx;
top: 150px;
right: -50px;
}
.item-top {
@@ -196,11 +218,9 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
padding-bottom: 8px;
border-bottom: 1px solid #eee;
.item-top-code {
font-size: 13px;
font-size: 14px;
color: #333;
}
@@ -213,7 +233,6 @@
.item-bom {
position: relative; //添加的定位
z-index: 100;
margin-top: 10px;
display: flex;
flex-direction: row;
align-items: center;
@@ -233,7 +252,7 @@
.item_list {
position: relative; //添加的定位
z-index: 100;
margin-top: 10px;
margin-top: 5px;
}
.item_btn {
@@ -243,7 +262,6 @@
align-items: center;
width: 100%;
justify-content: center;
margin-top: 10px;
}
}
</style>

71
pages/records/reservationRecords4.vue
View File

@@ -6,31 +6,46 @@
<z-paging ref="paging" v-model="data" @query="queryList" :pagingStyle='styleObject' :auto='true'>
<view v-for="(item,index) in data" style=" display: flex;flex-direction: column;margin-left: 10px;margin-right: 10px;background: #fff;margin-top: 10px;
padding: 10px 20px;
border-radius: 20px;">
padding: 10px 0px;
border-radius: 15px;">
<view class="item">
<view class="left-circle"></view>
<!-- <view class="left-circle"></view>
<view class="right-circle"></view>
<view class="item-line"></view>
<view class="item-line"></view> -->
<view class="item-top">
<view class="item-top" style="margin-left: 16px;margin-right: 16px;">
<text class="item-top-code">预约单号：{{item.reserveCode}}</text>
<text class="item-top-state">{{item.stateValue}}</text>
</view>
<view
style="display: flex;flex-direction: row;align-items: center;margin-left: 16px;margin-right: 16px;margin-top: 15px;">
<text
style="font-size: 16px;margin-right: 8px;color: #bbb;flex: 1;margin-right: 10px;">{{item.storeName}}</text>
<view class="item-bom">
</view>
<view class="item-bom" style="margin-left: 16px;margin-right: 16px;margin-top: 8px;">
<view class="item-bom-left">
<view style="display: flex;flex-direction: row;align-items: center;">
<text
style="font-size: 16px;margin-right: 5px;color: #BBBBBB;">{{item.storeName}}</text>
<image src="../../static/phone-1.png" style="width: 15px;height: 15px;"
@click="makePhoneCall(item.linkPhone)"></image>
<view style="display: flex;flex-direction: row;align-items: center;"
@click="makePhoneCall(item.linkPhone)">
<image src="../../static/phone-1.png"
style="width: 20px;height: 20px;margin-right: 5px;"></image>
<text style="color: #bbb;">咨询电话</text>
</view>
<!-- <view style="display: flex;flex-direction: row;align-items: center;">
<text
style="font-size: 16px;margin-right: 8px;color: #BBBBBB;">{{item.storeName}}</text>
<image src="../../static/phone-1.png" style="width: 20px;height: 20px;"
@click="makePhoneCall(item.linkPhone)"></image>
</view> -->
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
<image src="../../static/time.png" style="width: 15px;height: 15px;margin-right: 5px;">
</image>
@@ -38,7 +53,7 @@
<text style="font-size: 12px;color: #BBBBBB;">{{item.reserveDate}}</text>
</view>
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 20px;">
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
<text style="font-size: 12px;color: #BBBBBB; margin-right: 5px;">提菜人：</text>
<text
style="font-size: 12px;color: #BBBBBB; margin-right: 5px;">{{item.userName}}</text>
@@ -56,24 +71,33 @@
<view class="item-bom_right" style="box-sizing: border-box;">
<text style="opacity: 0.7;font-size: 18px;font-weight: 800;font-family: sans-serif;z-index: 101;
width: 100px; height: 100px;line-height: 100px; text-align: center; background: #666;
width: 104px; height: 104px;line-height: 104px; text-align: center; background: #666;
position: absolute;border-radius: 20px;color: #fff;">已失效</text>
<image src="https://supervise.yxtsoft.com/lpk/image/daiticai.png"
style="width: 100px; height: 100px;z-index: 100;border-radius: 20px;">
style="width: 104px; height: 104px;z-index: 100;border-radius: 20px;">
</image>
</view>
</view>
<view class="item_list" v-if="item.showLsit">
<view style="
height: 30px;margin-top: 5px;">
<image src="https://supervise.yxtsoft.com/lpk/image/reservationRecords_icon2.png"
style="width: 100%;height: 100%;" mode="scaleToFill"></image>
</view>
<view class="item_list" v-if="item.showLsit" style="margin-left: 16px;margin-right: 16px;">
<view v-for="(child,index) in item.goodsVo"
style="display: flex;flex-direction: row;width: 100%;">
<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;width: 100%;
padding-left: 10px;padding-right: 10px;margin-top: 8px;">
padding-left: 10px;padding-right: 10px;margin-bottom: 8px;">
<text style="font-size: 12px;color: #BBBBBB;">{{child.goodName}}</text>
<text style="font-size: 12px;color: #BBBBBB;">{{child.num}}{{child.unitName}}</text>
</view>
@@ -107,7 +131,7 @@
'padding-top': '10px',
'padding-bottom': '10px',
'border-radius': '15px',
'background': '#f2f2f2'
'background': '#F9F9F9'
},
data: []
}
@@ -164,6 +188,9 @@
.item {
position: relative;
box-sizing: border-box;
display: flex;
box-sizing: border-box;
flex-direction: column;
// /*最重要的部分如下：*/
// background-image: radial-gradient(circle at left 50%, #f2f2f2, #f2f2f2 12px, transparent 12px),
// radial-gradient(circle at right 50%, #f2f2f2, #f2f2f2 12px, transparent 12px);
@@ -204,11 +231,11 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
padding-bottom: 8px;
border-bottom: 1px solid #eee;
// padding-bottom: 8px;
// border-bottom: 1px solid #eee;
.item-top-code {
font-size: 13px;
font-size: 14px;
color: #BBBBBB;
}
@@ -221,7 +248,6 @@
.item-bom {
position: relative; //添加的定位
z-index: 100;
margin-top: 10px;
display: flex;
flex-direction: row;
align-items: center;
@@ -241,7 +267,7 @@
.item_list {
position: relative; //添加的定位
z-index: 100;
margin-top: 10px;
margin-top: 5px;
}
.item_btn {
@@ -251,7 +277,6 @@
align-items: center;
width: 100%;
justify-content: center;
margin-top: 10px;
}
}
</style>

9
utils/requester.js
View File

@@ -42,7 +42,7 @@ const request = (options, noLoading) => {
}
Object.assign(_opts, options)
let _token = token.getToken()
console.log("token",_token)
console.log("token", _token)
let _baseUrl = config.baseUrl
let _tokenName = config.tokenName
if (_tokenName) {
@@ -92,10 +92,13 @@ const request = (options, noLoading) => {
});
} else {
if (_opts.showFailMessage) {
console.log("data.msg>>>>>", data.msg);
uni.showToast({
title: data.msg,
icon: 'none',
duration: 2000,
duration: 5000,
})
}
}
@@ -157,7 +160,9 @@ const request = (options, noLoading) => {
},
complete() {
if (_opts.showLoading) {
console.log("showLoading>>>>>", _opts.showLoading);
uni.hideLoading()
}
}
})