Skip to content

U
user
Commit 46804ace by songbingqi
Options

完成部分开发

parent 007c5c32
Showing with 60 additions and 34 deletions
orderSubPackage/pages/orderInfo/index.vue
...@@ -40,14 +40,29 @@ ...@@ -40,14 +40,29 @@
>分钟后可取，请稍等！</view >分钟后可取，请稍等！</view
> >
</view> </view>
<view class="statusTip"> <view class="statusTip" v-if="isBuild">
<view class="tip_box"> <view class="tip_box">
<view class="tip"> <view class="tip">
<view class="icon"></view> <view class="icon">
<view class="tip_tittle">1待制作</view> <image v-if="[1].indexOf(Number(orderInfo.state))!=-1" mode="aspectFit" :src="'/static/imgs/daizhizuo_action.png'"/>
<image v-else mode="aspectFit" :src="'/static/imgs/daizhizuo.png'"/>
</view>
<view :class="[1].indexOf(Number(orderInfo.state))!=-1?'tip_titile_action':'tip_tittle'">1待制作</view>
</view>
<view class="tip">
<view class="icon">
<image v-if="[2, 3].indexOf(Number(orderInfo.state))!=-1" mode="aspectFit" :src="'/static/imgs/zhizuozhong_action.png'"/>
<image v-else mode="aspectFit" :src="'/static/imgs/zhizuozhong.png'"/>
</view>
<view :class="[2, 3].indexOf(Number(orderInfo.state))!=-1?'tip_titile_action':'tip_tittle'">2制作中</view>
</view>
<view class="tip">
<view class="icon">
<image v-if="[4, 5].indexOf(Number(orderInfo.state))!=-1" mode="aspectFit" :src="'/static/imgs/wancheng_action.png'"/>
<image v-else mode="aspectFit" :src="'/static/imgs/wancheng.png'"/>
</view>
<view :class="[4, 5].indexOf(Number(orderInfo.state))!=-1?'tip_titile_action':'tip_tittle'">3完成</view>
</view> </view>
<view class="tip"></view>
<view class="tip"></view>
</view> </view>
</view> </view>
<!-- <div class="btns"> <!-- <div class="btns">
...@@ -90,17 +105,17 @@ ...@@ -90,17 +105,17 @@
<!-- </div> <!-- </div>
<div class="order_flow" v-if="qrShow"> --> <div class="order_flow" v-if="qrShow"> -->
<!-- <div v-if="qrShow" class="code">取单码 {{ orderInfo.orderNum }}</div> --> <!-- <div v-if="qrShow" class="code">取单码 {{ orderInfo.orderNum }}</div> -->
<div class="realQrcodeBox" v-if="qrShow && isBuild"> <div class="realQrcodeBox" v-if="isBuild">
<image mode="aspectFit" :src="ewmImg" /> <image mode="aspectFit" :src="ewmImg" />
</div> </div>
<div v-if="qrShow && !isBuild" class="qr_code"> <!-- <div v-else class="qr_code">
<image <image
mode="aspectFit" mode="aspectFit"
:src="'/static/imgs/erweimazhedang.png'" :src="'/static/imgs/erweimazhedang.png'"
class="qr" class="qr"
/> />
</div> </div> -->
<div class="ercodeTip">制作完成后,扫描此二维码取杯。</div> <div class="ercodeTip" v-if="isBuild">制作完成后,扫描此二维码取杯。</div>
<!-- <view class="scan_tips" v-if="qrTextShow">——制作完成后才能扫哦——</view> --> <!-- <view class="scan_tips" v-if="qrTextShow">——制作完成后才能扫哦——</view> -->
<canvas <canvas
v-if="qrShow" v-if="qrShow"
...@@ -116,7 +131,7 @@ ...@@ -116,7 +131,7 @@
" "
/> />
<div v-if="qrShow" class="flow_describe"> <div v-if="qrShow" class="flow_describe">
<view class="titleBox"> <!-- <view class="titleBox">
<view class="qrcodeTitle"> <view class="qrcodeTitle">
<view class="title">扫码流程</view> <view class="title">扫码流程</view>
<view class="icon"> <view class="icon">
...@@ -137,15 +152,15 @@ ...@@ -137,15 +152,15 @@
/> />
</view> </view>
</view> </view>
</view> </view> -->
<image <image
:mode="'aspectFit'" :mode="'aspectFit'"
class="flow_img" class="flow_img"
src="/static/imgs/saomaliucheng.png" src="/static/imgs/saomaliucheng.png"
/> />
</div> </div>
<div class="takeCupTip"> <div class="takeCupTip" v-if="qrShow">
<div class="text"> <div class="text" @click="goShow()">
<view>查看实景取杯演示</view> <view>查看实景取杯演示</view>
<image <image
class="arrow" class="arrow"
...@@ -153,7 +168,7 @@ ...@@ -153,7 +168,7 @@
:src="'../../../static/imgs/jiantouhui.png'" :src="'../../../static/imgs/jiantouhui.png'"
/> />
</div> </div>
<div class="btn">退款</div> <div class="btn" @click="refundInfo" v-if="checkStatus(orderInfo.state, [12, 13, 14, 15])">退款</div>
</div> </div>
</div> </div>
<div class="shop_info"> <div class="shop_info">
...@@ -304,8 +319,8 @@ export default { ...@@ -304,8 +319,8 @@ export default {
this.timer = setTimeout(async () => { this.timer = setTimeout(async () => {
const { data = {} } = await Order.getOrderDetail({ orderId: this.orderInfo.id, nodLoading:true }) const { data = {} } = await Order.getOrderDetail({ orderId: this.orderInfo.id, nodLoading:true })
this.orderInfo = data?.data this.orderInfo = data?.data
const getTime = ["2", "3"].indexOf(this.orderInfo.state) >= 0; const getTime = [2,3].indexOf(Number(this.orderInfo.state)) >= 0;
const isBuild = ["2", "3", "4", "5"].indexOf(this.orderInfo.state) >= 0; const isBuild = [2,3].indexOf(Number(this.orderInfo.state)) >= 0;
if (getTime) { if (getTime) {
const { data = {} } = (await Order.getOrderWaiteTime({ orderId: this.orderInfo.id, nodLoading:true })) || {}; const { data = {} } = (await Order.getOrderWaiteTime({ orderId: this.orderInfo.id, nodLoading:true })) || {};
this.waitTime = data?.data; this.waitTime = data?.data;
...@@ -596,7 +611,7 @@ export default { ...@@ -596,7 +611,7 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: 15rpx; margin-top: 30rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
...@@ -626,15 +641,13 @@ export default { ...@@ -626,15 +641,13 @@ export default {
} }
} }
.statusTip { .statusTip {
border: 1rpx solid red; margin: 30rpx 0px;
margin: 15rpx 0px;
// text-align: center; // text-align: center;
height: 100rpx; height: 100rpx;
.tip_box { .tip_box {
width: 450rpx; width: 450rpx;
margin: 0 auto; margin: 0 auto;
border: 1rpx solid blue;
height: 100%; height: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -643,18 +656,32 @@ export default { ...@@ -643,18 +656,32 @@ export default {
.tip { .tip {
height: 100%; height: 100%;
width: 100rpx; width: 100rpx;
border: 1rpx solid green;
.icon { .icon {
width: 60rpx; width: 60rpx;
height: 60rpx; height: 60rpx;
margin: 5rpx auto; margin: 5rpx auto;
border: 1rpx solid pink;
image {
width: 100%;
height: 100%;
transform: scale(1.4) rotate(0deg)
}
} }
.tip_tittle { .tip_tittle {
margin-top: 10rpx;
text-align: center; text-align: center;
font-size: 25rpx; font-size: 25rpx;
color: rgb(151, 151, 151);
}
.tip_titile_action {
margin-top: 10rpx;
text-align: center;
font-weight: bolder;
font-size: 25rpx;
} }
} }
} }
...@@ -783,8 +810,8 @@ export default { ...@@ -783,8 +810,8 @@ export default {
.flow_describe { .flow_describe {
padding-top: 29rpx; padding-top: 29rpx;
padding-left: 32rpx; padding-left: 32rpx;
padding-right: 32rpx; padding-right: 10rpx;
padding-bottom: 60rpx; padding-bottom: 32rpx;
.titleBox { .titleBox {
display: flex; display: flex;
...@@ -837,7 +864,7 @@ export default { ...@@ -837,7 +864,7 @@ export default {
} }
.flow_img { .flow_img {
padding: 18rpx 0rpx 0rpx 32rpx; padding: 18rpx 0rpx 0rpx 10rpx;
width: 592rpx; width: 592rpx;
height: 244rpx; height: 244rpx;
display: block; display: block;
......
pages/menu/menu.vue
...@@ -345,20 +345,19 @@ export default { ...@@ -345,20 +345,19 @@ export default {
}, },
async getBanerList(id = this.shopInfo.id) { async getBanerList(id = this.shopInfo.id) {
const {data = {}} = await Menu.getSwiperList({ id }); const {data = {}} = await Menu.getSwiperList({ id });
const sendData = {
home:[ 'https://cdn.uviewui.com/uview/swiper/swiper1.png',
'https://cdn.uviewui.com/uview/swiper/swiper2.png',
'https://cdn.uviewui.com/uview/swiper/swiper3.png', ],
mine:[ 'https://cdn.uviewui.com/uview/swiper/swiper1.png',
'https://cdn.uviewui.com/uview/swiper/swiper2.png',
'https://cdn.uviewui.com/uview/swiper/swiper3.png', ],
}
if(data.code===200) { if(data.code===200) {
const {home = [],mine = []} = data?.data
const sendData = {
home:home?home.map(item=>{return item.image}):[],
mine:mine?mine.map(item=>{return item.image}):[],
}
this.$store.commit("setSwiperList", sendData); this.$store.commit("setSwiperList", sendData);
} }
console.log(data) console.log(data)
}, },
async getHomeOrder(id = this.shopInfo.id) { async getHomeOrder(id = this.shopInfo.id) {
console.log(123)
if (!this.userms) return; if (!this.userms) return;
const res = await Order.getHomeOrder({ shopId: id }); const res = await Order.getHomeOrder({ shopId: id });
const data = res?.data; const data = res?.data;
...@@ -430,7 +429,7 @@ export default { ...@@ -430,7 +429,7 @@ export default {
//1.2 拒绝授权 //1.2 拒绝授权
this.getShopMenus(); this.getShopMenus();
wx.exitMiniProgram({ success: (res) => {} }); wx.exitMiniProgram({ success: (res) => {} });
// console.log("获取位置失败") console.log("获取位置失败")
this.showToast({ this.showToast({
title: "获取位置失败，请同意授权", title: "获取位置失败，请同意授权",
icon: "error", icon: "error",
......
static/imgs/saomaliucheng.png
static/imgs/saomaliucheng.png

103 KB | W: | H:

static/imgs/saomaliucheng.png

27.5 KB | W: | H:

static/imgs/saomaliucheng.png
static/imgs/saomaliucheng.png
static/imgs/saomaliucheng.png
static/imgs/saomaliucheng.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment