Skip to content

U
user
Commit 9a2f1321 by 宋冰琦
Options

修复部分bug

parent 4a0bf0a8
Showing with 23 additions and 19 deletions
components/OrderQrCode/index.vue
......@@ -9,12 +9,9 @@
</div>
<div class="code">取单码 {{ orderInfo.orderNum }}</div>
<!-- <image mode="scaleToFill" :src="qrCode" class="qr_code"></image> -->
<div class="qr_code_readly" v-if="!showMask">
<div class="qr_code_readly">
<image mode="scaleToFill" :src="qrCode" class="qr"></image>
</div>
<div class="qr_code" v-else>
<image :src="'/static/imgs/erweimazhedang.png'" class="qr"></image>
</div>
<!-- <view class="status_text" v-if="showMask">——制作完成后才能扫哦——</view> -->
<div class="flow_describe">
<view class="titleBox">
......@@ -144,11 +141,11 @@ export default {
this.orderInfo = data;
// console.log("order:"+JSON.stringify(this.orderInfo));
if(this.showMask) {
this.qrCode = '';
} else {
// if(this.showMask) {
// this.qrCode = '';
// } else {
this.qrCode = path;
}
// }
},
jsonParse(json) {
return JSON.parse(json)
......
components/Ticket/index.vue
......@@ -51,10 +51,10 @@
<view v-if="info.status===2||info.status===3" class="tap">
<view class="tap_innew">
<view class="text_ysy" v-if="info.status===2">
<image :style="{'width':'138%','height':'138%'}" :src="'https://hooloo-dev-api.gdatac.com/resources/used.png'">
<image :style="{'width':'138%','height':'138%'}" :src="'https://hooloo-mp.oss-cn-shanghai.aliyuncs.com/resources/used.png'">
</view>
<view class="text_ysx" v-else>
<image :style="{'width':'138%','height':'138%'}" :src="'https://hooloo-dev-api.gdatac.com/resources/expired.png'">
<image :style="{'width':'138%','height':'138%'}" :src="'https://hooloo-mp.oss-cn-shanghai.aliyuncs.com/resources/expired.png'">
</view>
</view>
</view>
......@@ -437,7 +437,7 @@ export default {
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #999999;
// background: url('https://hooloo-dev-api.gdatac.com/resources/used.png');
// background: url('https://hooloo-mp.oss-cn-shanghai.aliyuncs.com/resources/used.png');
// background-size: 139%;
// background-repeat: no-repeat;
// background-position: center;
......@@ -451,7 +451,7 @@ export default {
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #999999;
// background: url('https://hooloo-dev-api.gdatac.com/resources/expired.png');
// background: url('https://hooloo-mp.oss-cn-shanghai.aliyuncs.com/resources/expired.png');
// background-size: 139%;
// background-repeat: no-repeat;
// background-position: center;
......
orderSubPackage/pages/orderInfo/index.vue
......@@ -261,7 +261,7 @@ export default {
const {data = {}} = await Order.getOrderDetail({orderId:oId})
this.orderInfo = data?.data
const getTime = ['2', '3'].indexOf(this.orderInfo.state) >= 0
const isBuild = ['4', '5'].indexOf(this.orderInfo.state) >= 0;
const isBuild = ['2','3','4', '5'].indexOf(this.orderInfo.state) >= 0;
if(getTime){
const {data = {}} = await Order.getOrderWaiteTime({orderId:oId})||{}
this.waitTime = data?.data
......
orderSubPackage/pages/settlement/index.vue
<template>
<view class="pages">
<view class="topBar" :style="{'padding-top':systemBarHeight.statusBarHeight+'px','height':systemBarHeight.navigationBarHeight+'px'}">
<u-icon @click="Utils.goBack()" name="arrow-left" color="#000000" size="20"></u-icon>
<u-icon @click="returnHome?goHome():Utils.goBack()" name="arrow-left" color="#000000" size="20"></u-icon>
<view class="tabTitle" :style="{'line-height':systemBarHeight.navigationBarHeight+'px'}">订单结算</view>
</view>
<div class="shop_info" :style="{'margin-top':(systemBarHeight.statusBarHeight+systemBarHeight.navigationBarHeight+Utils.getPx(32))+'px'}">
......@@ -147,6 +147,7 @@ export default {
this.TermsStatus = uni.getStorageSync('TermsStatus') || false
},
async onLoad(option) {
this.returnHome = false
uni.setStorageSync('allow',true)
console.log('onload')
// 清除优惠卷信息
......@@ -184,11 +185,13 @@ export default {
$EventBus.$emit('updateCar');
// let id = decodeURIComponent(q).split('?')[1].split('=')[1];
const optionDecode = Utils.getUrlParams2(decodeURIComponent(q))
console.log(optionDecode,'optionDecode')
this.optionDecode = optionDecode
const loginInfo = uni.getStorageSync("loginInfo")
const { id, recognizePerson } = optionDecode
const openid = loginInfo?JSON.parse(loginInfo).openid:""
const sendData = {}
this.returnHome = true
if(recognizePerson){
sendData.faceInfoId = recognizePerson,
sendData.openid = openid
......@@ -227,6 +230,7 @@ export default {
data() {
return {
cleanFlag:false,
returnHome:false,
messageList:[
{
tmp:'1uErx-15S-3vuopXSvvsxCeM_Jd-1iZC-nXzd2yW3QU',
......@@ -328,6 +332,9 @@ export default {
}
},
methods: {
goHome() {
uni.switchTab({ url: '/pages/menu/menu' })
},
getPx(rpx) {
// console.log((rpx * (wx.getSystemInfoSync().windowWidth / 750)));
// console.log(wx.getSystemInfoSync().windowWidth);
......
pages/menu/menu.vue
......@@ -266,12 +266,12 @@ export default {
},
openQrcode() {
// 不生成二维码
if(['2', '3'].indexOf(this.orderInfo.state) != -1){
this.$refs.OrderQrCode.open(this.orderInfo, "");
return;
} else {
// if(['2', '3'].indexOf(this.orderInfo.state) != -1){
// this.$refs.OrderQrCode.open(this.orderInfo, "");
// return;
// } else {
this.$refs.OrderQrCode.open(this.orderInfo, this.orderInfo.pickCode)
}
// }
// new QRCode('myQrcode2', {
// text: this.orderInfo.pickCode,
......
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