This commit is contained in:
zmj 2024-06-15 17:29:39 +08:00
parent 5c1086a4a9
commit fda0ed3841
4 changed files with 95 additions and 16 deletions

View File

@ -433,6 +433,16 @@
} }
} }
} }
.shop-item:last-child {
margin-bottom: 100px;
background-color: red;
}
} }
} }

46
pages/login/test.vue Normal file
View File

@ -0,0 +1,46 @@
<template>
<view class="" style="padding: 100rpx;">
<up-input :customStyle="{height: '100%'}" v-model="zh" placeholderClass="place" placeholder="请输入手机号" />
<up-button @click="submit" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff"
size="28"></up-icon></up-button>
</view>
</template>
<script setup>
import {
accountLogin,
userInfoApi
} from "@/api/user.js";
import {
ref
} from "vue"
import useUserStore from "@/store/user";
const userStore = useUserStore();
const zh = ref("")
const submit = () => {
accountLogin({
account: zh.value,
"password": "123456",
"terminal": 2,
"scene": 1
}).then(res => {
uni.setStorageSync('token', res.data.token);
userStore.setToken(res.data.token);
console.log(res.data.token)
userInfoApi().then(res => {
const user = res.data;
userStore.setUserInfo(user);
uni.reLaunch({
url: '/pages/index/index'
}) // token
})
})
}
</script>
<style>
</style>

View File

@ -53,7 +53,7 @@
@click="rePay">立即支付</up-button></view> @click="rePay">立即支付</up-button></view>
</view> </view>
<view v-else class="item-btn"> <view v-else class="item-btn">
<view @click="showVerifyPop=true,options.code=datas.verify_img" v-if="datas.status==1" style="width: 80px;"> <view @click="showVerifyFn" v-if="datas.status==1" style="width: 80px;">
<up-button size="small" plain color="#20B128" shape="circle">核销码</up-button> <up-button size="small" plain color="#20B128" shape="circle">核销码</up-button>
</view> </view>
<view @click="purchaseAgain" v-if="datas.status==2||datas.status==3" style="width: 80px;"><up-button <view @click="purchaseAgain" v-if="datas.status==2||datas.status==3" style="width: 80px;"><up-button
@ -65,18 +65,9 @@
</view> </view>
</view> </view>
<view v-if='showVerifyPop'>
<up-popup :show="showVerifyPop" @close="showVerifyPop=false" @open="showVerifyPop=true" mode="center">
<view style="width: 80vw;height: 20vh;position: relative;">
<view style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);">
<up-image :src="datas.verify_img" width="404rpx" height="60rpx"></up-image>
<view style="font-weight: bold;color: #333;font-size: 26;text-align: center;margin-top: 20rpx;">
核销码 {{datas.verify_code}}
</view>
</view>
</view>
</up-popup>
</view>
</template> </template>
<script setup> <script setup>
@ -141,6 +132,10 @@
emit('applyAfterSales', props.datas) emit('applyAfterSales', props.datas)
} }
const showVerifyFn = () => {
emit('showVerifyFn', props.datas)
}
const showVerifyPop = ref(false) const showVerifyPop = ref(false)
const options = reactive({ const options = reactive({
width: 500, // rpx width: 500, // rpx

View File

@ -23,7 +23,8 @@
<view v-if="list.length>0" class="list"> <view v-if="list.length>0" class="list">
<good v-for="(item, index) in list" :datas="item" :key="index" :type="k" :status="status" <good v-for="(item, index) in list" :datas="item" :key="index" :type="k" :status="status"
:order_id='item.order_id' @cancleOrder="cancleOrder" @takeOrder="takeOrder" :order_id='item.order_id' @cancleOrder="cancleOrder" @takeOrder="takeOrder"
@rePay="rePay" @purchaseAgain="purchaseAgain" @applyAfterSales="applyAfterSales"></good> @rePay="rePay" @purchaseAgain="purchaseAgain" @applyAfterSales="applyAfterSales"
@showVerifyFn='showVerifyFn'></good>
</view> </view>
<view v-if="!where[k].loading&&list.length==0" style="padding-top: 100rpx;"> <view v-if="!where[k].loading&&list.length==0" style="padding-top: 100rpx;">
<up-empty text="订单空空如也" <up-empty text="订单空空如也"
@ -102,6 +103,16 @@
</view> </view>
</view> </view>
</up-popup> </up-popup>
<view class="mask" v-if='showVerifyPop' @click="showVerifyPop=false">
<view
style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);background-color: white;padding: 20rpx;">
<up-image :src="orderData.verify_img" width="404rpx" height="60rpx"></up-image>
<view style="font-weight: bold;color: #333;font-size: 26;text-align: center;margin-top: 20rpx;">
核销码 {{orderData.verify_code}}
</view>
</view>
</view>
</template> </template>
<script setup> <script setup>
@ -159,6 +170,14 @@
if (swiperCurrent.value == 4 && orderList.value[4].length == 0) getOrderList(4, -1, 1); //退 if (swiperCurrent.value == 4 && orderList.value[4].length == 0) getOrderList(4, -1, 1); //退
} }
const showVerifyPop = ref(false)
const orderData = ref({})
const showVerifyFn = (e) => {
showVerifyPop.value = true
orderData.value = e
}
// //
const showCancel = ref(false); const showCancel = ref(false);
let cancelId = ''; let cancelId = '';
@ -377,8 +396,6 @@
if (swiperCurrent.value == 2) getOrderList(2, 1, 1, ifPullReFresh); // if (swiperCurrent.value == 2) getOrderList(2, 1, 1, ifPullReFresh); //
if (swiperCurrent.value == 3) getOrderList(3, 2, 1, ifPullReFresh); // if (swiperCurrent.value == 3) getOrderList(3, 2, 1, ifPullReFresh); //
if (swiperCurrent.value == 4) getOrderList(4, -1, 1, ifPullReFresh); //退 if (swiperCurrent.value == 4) getOrderList(4, -1, 1, ifPullReFresh); //退
} }
let back = 0; let back = 0;
@ -587,4 +604,15 @@
/* 缩小 */ /* 缩小 */
} }
} }
.mask {
position: fixed;
width: 100vw;
height: 100vh;
background-color: rgba(0, 0, 0, .5);
top: 0;
left: 0;
z-index: 99999 !important;
}
</style> </style>