add
This commit is contained in:
parent
be59c24415
commit
45b8ef63bd
|
@ -70,6 +70,8 @@
|
|||
cart_num: ''
|
||||
});
|
||||
const setData = (e) => {
|
||||
console.log(datas.value)
|
||||
|
||||
datas.value = e;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
let BASE_URL
|
||||
import store from "@/store/user.js"
|
||||
// 环境
|
||||
// let env = "dev"
|
||||
let env = "prod"
|
||||
let env = "dev"
|
||||
// let env = "prod"
|
||||
// let env = "liu";
|
||||
|
||||
switch (env) {
|
||||
|
|
|
@ -332,7 +332,7 @@
|
|||
pid: pid,
|
||||
page_no: page_no,
|
||||
page_size: 30,
|
||||
three: three,
|
||||
leve: three,
|
||||
store_id: STORE_INFO.id || '' // 店铺id,用于获取店铺分类列表,如果为空则获取全部分类列表,否则获取店铺分类列表。
|
||||
}).then(res => {
|
||||
if (pid == 0) { // 加载一级分类时设置全部分类
|
||||
|
@ -428,6 +428,8 @@
|
|||
})
|
||||
}
|
||||
|
||||
// uni.setStorageSync()
|
||||
|
||||
// 选择商品相关
|
||||
const showGoodPopup = ref(false);
|
||||
const goodRef = ref(null);
|
||||
|
|
|
@ -53,9 +53,8 @@
|
|||
@click="rePay">立即支付</up-button></view>
|
||||
</view>
|
||||
<view v-else class="item-btn">
|
||||
<!-- <view style="width: 80px;"><up-button size="small" plain color="#989898" shape="circle">申请售后</up-button></view> -->
|
||||
<!-- <view @click="takeOrder" v-if="datas.status==1" style="width: 80px;"><up-button size="small" color="#20B128"
|
||||
shape="circle">确认收货</up-button></view> -->
|
||||
<view @click="showVerifyPop=true,options.code=datas.verify_code" v-if="datas.status==1"
|
||||
style="width: 80px;"><up-button size="small" plain color="#20B128" shape="circle">核销码</up-button></view>
|
||||
<view @click="purchaseAgain" v-if="datas.status==2||datas.status==3" style="width: 80px;"><up-button
|
||||
size="small" plain color="#20B128" shape="circle">再次购买</up-button></view>
|
||||
<view @click="navTo" style="width: 80px;"><up-button size="small" plain color="#20B128"
|
||||
|
@ -63,17 +62,27 @@
|
|||
<view @click="applySh" style="width: 80px;" v-if="datas.status == 1 || datas.status == 2"><up-button
|
||||
size="small" plain color="#ccc" shape="circle">申请售后</up-button></view>
|
||||
</view>
|
||||
<!-- <view v-if="type==3" class="item-close">
|
||||
<view class="title">
|
||||
<view class="type">退款申请中</view>
|
||||
<view>等待商家处理</view>
|
||||
</view>
|
||||
<up-icon name="arrow-right"></up-icon>
|
||||
</view> -->
|
||||
</view>
|
||||
|
||||
|
||||
<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%);">
|
||||
<w-barcode :options="options"></w-barcode>
|
||||
<view style="font-weight: bold;color: #333;font-size: 26;text-align: center;">
|
||||
核销码 {{datas.verify_code}}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</up-popup>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {
|
||||
ref,
|
||||
reactive
|
||||
} from "vue"
|
||||
// 订单状态(0:待发货;1:待收货;2:已完成;3:已完成)
|
||||
const props = defineProps({
|
||||
type: {
|
||||
|
@ -126,6 +135,13 @@
|
|||
const applySh = () => {
|
||||
emit('applyAfterSales', props.datas)
|
||||
}
|
||||
|
||||
const showVerifyPop = ref(false)
|
||||
const options = reactive({
|
||||
width: 500, // 宽度 单位rpx
|
||||
height: 100, // 高度 单位rpx
|
||||
code: props.datas.verify_code, // 生成条形码的值
|
||||
}, )
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
<template>
|
||||
<view class="">
|
||||
<view class="m-card m-address">
|
||||
{{orderInfo.shipping_type}}
|
||||
<view class="address-info" @click="showAddress = true" v-if='orderInfo.shipping_type==1'>
|
||||
<view class="top">
|
||||
<up-icon name="account"></up-icon>
|
||||
|
|
Loading…
Reference in New Issue