add
This commit is contained in:
parent
28f638e2e3
commit
e053e6f593
|
@ -2,8 +2,8 @@ let BASE_URL
|
||||||
import store from "@/store/user.js"
|
import store from "@/store/user.js"
|
||||||
// 环境
|
// 环境
|
||||||
// let env = "dev"
|
// let env = "dev"
|
||||||
// let env = "prod"
|
let env = "prod"
|
||||||
let env = "liu";
|
// let env = "liu";
|
||||||
|
|
||||||
switch (env) {
|
switch (env) {
|
||||||
case 'dev':
|
case 'dev':
|
||||||
|
|
|
@ -64,24 +64,27 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
<view v-if='showVerifyPop'>
|
||||||
<up-popup :show="showVerifyPop" @close="showVerifyPop=false" @open="showVerifyPop=true" mode="center">
|
<up-popup :show="showVerifyPop" @close="showVerifyPop=false" @open="showVerifyPop=true" mode="center">
|
||||||
<view style="width: 80vw;height: 20vh;position: relative;">
|
<view style="width: 80vw;height: 20vh;position: relative;">
|
||||||
<view style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);">
|
<view style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);">
|
||||||
<w-barcode :options="options"></w-barcode>
|
<w-barcode v-if='options.code' :options="options"></w-barcode>
|
||||||
<view style="font-weight: bold;color: #333;font-size: 26;text-align: center;">
|
<view style="font-weight: bold;color: #333;font-size: 26;text-align: center;">
|
||||||
核销码 {{datas.verify_code}}
|
核销码 {{datas.verify_code}}
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</up-popup>
|
</up-popup>
|
||||||
|
</view>
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import {
|
import {
|
||||||
ref,
|
ref,
|
||||||
reactive
|
reactive,
|
||||||
|
nextTick
|
||||||
} from "vue"
|
} from "vue"
|
||||||
// 订单状态(0:待发货;1:待收货;2:已完成;3:已完成)
|
// 订单状态(0:待发货;1:待收货;2:已完成;3:已完成)
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
|
|
@ -22,11 +22,11 @@
|
||||||
<view class="address-btn item-center">
|
<view class="address-btn item-center">
|
||||||
<view class='ship-type' style="">
|
<view class='ship-type' style="">
|
||||||
<view class="ship-type-item" :class='{actShipItem:orderInfo.shipping_type==2 }'
|
<view class="ship-type-item" :class='{actShipItem:orderInfo.shipping_type==2 }'
|
||||||
@click='orderInfo.shipping_type=2' v-if='orderInfo.default_delivery==1'>
|
@click='orderInfo.shipping_type=2'>
|
||||||
自提
|
自提
|
||||||
</view>
|
</view>
|
||||||
<view class="ship-type-item" @click='orderInfo.shipping_type=1'
|
<view class="ship-type-item" @click='orderInfo.shipping_type=1'
|
||||||
:class='{actShipItem:orderInfo.shipping_type==1 }'>
|
:class='{actShipItem:orderInfo.shipping_type==1 }' v-if='orderInfo.default_delivery==1'>
|
||||||
配送
|
配送
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -326,7 +326,7 @@
|
||||||
cartList.value = res.data.cart_list;
|
cartList.value = res.data.cart_list;
|
||||||
orderInfo.value = res.data.order;
|
orderInfo.value = res.data.order;
|
||||||
if (orderInfo.value.default_delivery == 0) {
|
if (orderInfo.value.default_delivery == 0) {
|
||||||
orderInfo.value.shipping_type = 1
|
orderInfo.value.shipping_type = 2
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue