Skip to content

U
user
Commit 3eb9bf9e by songbingqi
Options

完成优惠券弹框问题

parent 9f432744
Showing with 153 additions and 46 deletions
components/OrderQrCode/index.vue
......@@ -62,8 +62,8 @@
</view>
</view>
<!-- <div class="code">取单码 {{ orderInfo.orderNum }}</div> -->
<div class="qr_code_readly" :style="{'background-image':`url(${ewmImg})`}">
<!-- <image mode="scaleToFill" :src="ewmImg" class="qr"></image> -->
<div class="qr_code_readly">
<image mode="aspectFit" :src="ewmImg" class="qr"></image>
</div>
<div class="ercodeTip">制作完成后,扫描此二维码取杯。</div>
......@@ -469,17 +469,19 @@ export default {
text-align: center;
}
.qr_code_readly{
margin: 20rpx auto;
margin-top: 20rpx;
margin-bottom: 20rpx;
height: 300rpx;
background-repeat: no-repeat;
margin: 0 auto;
width: 300rpx;
margin-top: 20rpx;
margin-bottom: 20rpx;
height: 300rpx;
background-repeat: no-repeat;
background-position: center;
overflow: hidden;
.qr {
width: 100%;
height: 100%;
}
image {
width: 100%;
height: 100%;
vertical-align: bottom;
}
}
.qr_code {
height: 468rpx;
......
components/bocft-popup/bocft-popup.vue 0 → 100644
<template>
<u-popup :overlayStyle="{'z-index':'10073'}" bgColor="transparent" :show="show" mode="center" @close="close">
<image mode="widthFix" v-if="urlImg&&width&&height" class="empty_icon" :src="urlImg" :style="{'width':width+'rpx','height':height+'rpx'}"></image>
</u-popup>
</template>
<script>
export default {
name: 'bocft-popup',
computed: {
show(){
return this.$popupStore.state.show;
},
urlImg() {
return this.$popupStore.state.url
}
},
watch:{
urlImg(val) {
uni.getImageInfo({
src: val,
success:(image)=> {
const wheight = uni.getSystemInfoSync().windowHeight;
const wwidth = uni.getSystemInfoSync().windowWidth;
this.width = image.width>wwidth?wwidth+(wwidth/4):image.width
this.height = image.height>wheight?wheight:image.height
}
})
}
},
data() {
return {
percent: 0,
width:0,
height:0,
flag:false
};
},
methods:{
close() {
this.$popupStore.commit('closePopup')
}
}
}
</script>
<style lang="scss" scoped>
</style>
\ No newline at end of file
components/bocft-popup/initPopup.js 0 → 100644
// initPopup.js
import Vuex from 'vuex'
export default function initPopup(v) {
// 挂在store到全局Vue原型上
v.prototype.$popupStore = new Vuex.Store({
state: {
show:false,
url:""
},
mutations: {
closePopup(state,data) {
state.show = false
},
showPopup(state,data) {
console.log(data)
state = Object.assign(state,data)
state.show = true
},
}
})
v.prototype.showPopup = function (option) {
if (typeof option === 'object') {
if(option.hideTabBar){
wx.hideTabBar();
}
v.prototype.$popupStore.commit('showPopup', option)
}
}
}
components/bocft-toast/bocft-toast.vue
......@@ -23,9 +23,9 @@
title(){
return this.$toastStore.state.title;
},
time(){
time(){
return this.$toastStore.state.time;
}
}
},
methods:{
......
components/shopCar/shopCar.vue
......@@ -143,7 +143,7 @@
</view>
<view
class="shopClose"
v-if="!orderState"
v-if="!orderState&&orderState!=null"
:style="{ bottom: shopCar + 'rpx' }"
>
<view class="content">{{
......@@ -291,6 +291,9 @@ export default {
success: (res) => {
console.log(res);
if (res.authSetting["scope.userLocation"] == true) {
User.getLocation((state, params) => {
console.log(params)
});
//判断res.authsetting的值是true还是false
settleMentFunc();
} else {
......
main.js
......@@ -14,10 +14,14 @@ import User from "@/request/user";
// main.js
import initToast from "@/components/bocft-toast/initToast.js";
import showToast from "@/components/bocft-toast/bocft-toast.vue";
import Popup from "@/components/bocft-popup/bocft-popup.vue";
import initPopup from "@/components/bocft-popup/initPopup.js";
import taBar from "@/components/tabBar/tabBar.vue";
initToast(Vue);
initPopup(Vue)
Vue.component("show-toast", showToast);
Vue.component("show-popup", Popup);
Vue.component("taBar", taBar);
Vue.use(uView);
......
orderSubPackage/pages/orderInfo/index.vue
......@@ -36,7 +36,7 @@
>分钟后可取，请稍等！</view
>
<view v-if="orderInfo.state == 4||orderInfo.state == 5">制作完成请取杯，享用愉快！</view>
<view v-if="orderInfo.state == 6"> 订单完成 请搅拌后尽快引用哦~ </view>
<view v-if="orderInfo.state == 6"> 订单完成 请搅拌后尽快饮用哦~ </view>
<view v-if="orderInfo.state == 7"> 待取超时 品质不佳已丢弃，请联系客服重做！</view>
<view v-if="orderInfo.state >= 8 && orderInfo.state <= 15"
>非常抱歉，我们会继续努力的～</view
......@@ -82,13 +82,13 @@
class="btn"
>立即支付</a
>
<a
<!-- <a
type="primary"
@click="oneMoreOrder(orderInfo)"
v-if="orderInfo.state != 1&&orderInfo.state != 2&&orderInfo.state != 4&&orderInfo.state != 5"
class="btn"
>再来一单</a
>
> -->
<a
type="primary"
@click="refundInfo"
......@@ -101,8 +101,8 @@
<div class="order_flow" v-if="qrShow"> -->
<!-- <div v-if="qrShow" class="code">取单码 {{ orderInfo.orderNum }}</div> -->
<!-- <div class="realQrcodeBox" :style="{'background-image':`url(${ewmImg})`}" v-if="isBuild"> -->
<div class="realQrcodeBox" :style="{'background-image':`url(${ewmImg})`}" v-if="isBuild">
<!-- <image mode="aspectFit" :src="ewmImg" /> -->
<div class="realQrcodeBox" v-if="isBuild">
<image mode="aspectFit" :src="ewmImg" />
</div>
<!-- <div v-else class="qr_code">
<image
......@@ -169,7 +169,7 @@
type="primary"
@click="oneMoreOrder(orderInfo)"
v-else-if="orderInfo.state != 1&&orderInfo.state != 2&&orderInfo.state != 4&&orderInfo.state != 5"
class="btn"
class="btn_again"
>再来一单</div>
</div>
</div>
......@@ -741,6 +741,19 @@ export default {
line-height: 64rpx;
width: 180rpx;
}
.btn_again {
font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #ffffff;
width: 167rpx;
height: 64rpx;
text-align: center;
line-height: 64rpx;
background: #0050f6;
border-radius: 5rpx;
}
}
.btn {
font-size: 24rpx;
......
pages/menu/menu.vue
......@@ -75,31 +75,6 @@
</view>
</view>
<OrderQrCode ref="OrderQrCode" v-if="buied" :shopInfo="shopInfo" :userms="userms"/>
<!-- <view class="order-banner" v-if="buied" @click="openQrcode">
<view class="info">
<view class="first"
>取单码：<text class="first-code">{{
orderInfo.orderNum
}}</text></view
>
<view class="second1" v-if="orderInfo.state == '4'"
>订单已制作完成，请尽快取餐~</view
>
<view class="second" v-else
>请您耐心等候，剩余等候时间<text class="time">{{
orderInfo.waitTime
}}</text
>分钟</view
>
</view>
<view class="line"></view>
<view class="barCode-box">
<view class="barCode">
<image :src="'/static/imgs/icon-barcode.png'"></image>
</view>
<view class="barCode-dis">点击二维码取单</view>
</view>
</view> -->
<MenuAssembly
ref="MenuAssembly"
@getallNum="getallNum"
......@@ -111,6 +86,7 @@
<AreaPicker ref="AreaPicker" />
<show-toast ref="toast" />
<show-popup ref="popup" />
<taBar select="0"></taBar>
<ShopCar ref="shopbar" :orderState="shopInfo.orderState" :orderStateDesc="shopInfo.stateDesc" />
<u-popup :show="locationPopup" :round="10" mode="bottom" z-index="209999">
......@@ -251,6 +227,8 @@ export default {
User.wxLoginAndGetOpenid(true).then((loginInfo) => {
this.loginInfo = loginInfo;
});
}else{
User.getCouponImg()
}
},
onHide() {
......
pages/mine/mine.vue
......@@ -183,6 +183,7 @@
</view>
<taBar select="2"></taBar>
<show-toast ref="toast" />
<show-popup ref="popup" />
</view>
</template>
......
pages/order/order.vue
......@@ -169,6 +169,7 @@
</view>
<show-toast ref="toast" />
<show-popup ref="popup" />
<taBar select="1"></taBar>
</view>
</template>
......
request/user/index.js
......@@ -168,7 +168,6 @@ export default {
return uni.$u.http
.get(`/system/customer/detail`, {})
.then((res) => {
console.log(res, data);
const { birthday, createTime, id, phone, sex, userName, avatarUrl } =
res.data.data;
const { avatarUrl: localAvatarUrl } = uni.getStorageSync("UserInfo");
......@@ -189,6 +188,7 @@ export default {
}
Store.commit("setUserInfo", sendData);
uni.setStorageSync("UserInfo", sendData);
this.getCouponImg()
const MenuOption = Store.state.user.menuOption;
if (JSON.stringify(MenuOption) !== "{}") {
const { num, serial_no, source } = MenuOption;
......@@ -238,6 +238,33 @@ export default {
});
});
},
getCouponImg() {
const data = uni.getStorageSync('UserInfo')
const pages = getCurrentPages()
const route = pages[pages.length-1].route
const params = {
page_path:route,// 点击登录的页面路径
user_id:data.id,
phone:data.phoneNumber,
source:"return_user",
param:""
}
return uni.$u.http
.post("/v1/issue/return/user/coupon", params)
.then((res) => {
const { url,flag } = res.data.data
if(flag===1) {
context.showPopup({ url: url });
}
return res;
})
.catch((err) => {
const { data } = err;
const { msg } = data;
context.showToast({ title: msg, icon: "none" });
return err;
});
},
setAllow(params) {
return uni.$u.http
.post("/system/customer/allow", params)
......
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