工作代码提交
This commit is contained in:
parent
4ddbbf14b5
commit
0df65703a3
|
|
@ -265,6 +265,10 @@
|
|||
<text class="text">支持先用后付</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="gift mtb20" v-else>
|
||||
<text class="text">{{detail.intro}}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 最近购买 -->
|
||||
|
|
|
|||
|
|
@ -38,10 +38,8 @@
|
|||
</view>
|
||||
<!-- 购买用户 -->
|
||||
<view class="store df aic thd f1" v-else-if="mode == 'shop'">
|
||||
<image class="wh50 cir"
|
||||
src="https://img13.360buyimg.com/n1/jfs/t1/117234/35/34799/82687/6449f2b4Fd6e2eef9/a754c5e178c9e9be.jpg.avif"
|
||||
mode="aspectFill" />
|
||||
<view class="name ml10 c333">用户小A</view>
|
||||
<image class="wh50 cir" :src="item.cusImg" mode="aspectFill" />
|
||||
<view class="name ml10 c333">{{item.cusName}}</view>
|
||||
</view>
|
||||
|
||||
<!-- 订单状态 -->
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
"name" : "九亿",
|
||||
"appid" : "__UNI__08B31BC",
|
||||
"description" : "",
|
||||
"versionName" : "1.0.21",
|
||||
"versionCode" : 1021,
|
||||
"versionName" : "1.0.22",
|
||||
"versionCode" : 1022,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
import {
|
||||
ref,
|
||||
defineProps,
|
||||
computed,
|
||||
} from 'vue'
|
||||
// 状态栏
|
||||
import statusBar from '@/components/header/statusBar'
|
||||
|
|
@ -12,6 +13,8 @@
|
|||
default: {}
|
||||
}
|
||||
})
|
||||
// 是否礼包商品
|
||||
const giftPack = computed(() => props.detail.categoryCode?.startsWith('GIFT_PACK'))
|
||||
// 顶部激活
|
||||
const headerActive = ref(false)
|
||||
const share_more = ref(null)
|
||||
|
|
@ -109,7 +112,7 @@
|
|||
</view>
|
||||
|
||||
<view class="main f1 tac">
|
||||
<text>销量: {{detail.sales}}</text>
|
||||
<text v-if="!giftPack">销量: {{detail.sales}}</text>
|
||||
</view>
|
||||
|
||||
<view class="side df fdr jcr">
|
||||
|
|
|
|||
|
|
@ -340,6 +340,9 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 填充 -->
|
||||
<view class="fill" style="height: 30rpx;"></view>
|
||||
|
||||
<!-- 物流弹窗 -->
|
||||
<expressVue ref="expressRef" @confirm="handleExpressConfirm" />
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
import JyShopNavigation from '@/components/public/jy-shop-navigation'
|
||||
// 订单列表项
|
||||
import orderItem from '@/components/shop/order/item.vue';
|
||||
// 快递信息
|
||||
import expressVue from '@/components/shop/order/express.vue';
|
||||
// 工具库
|
||||
import util from '@/common/js/util';
|
||||
//
|
||||
|
|
@ -156,6 +158,24 @@
|
|||
// 重载列表
|
||||
refreshList()
|
||||
}
|
||||
|
||||
/**
|
||||
* 填写退货物流信息
|
||||
* @param {Object} param
|
||||
*/
|
||||
function handleExpressConfirm(param) {
|
||||
let data = {
|
||||
...param,
|
||||
id: orderDetail.id,
|
||||
}
|
||||
console.log('orderupdateRefund', data)
|
||||
return
|
||||
|
||||
order.orderupdateRefund(data).then(res => {
|
||||
// 重载列表
|
||||
refreshList()
|
||||
})
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -187,10 +207,12 @@
|
|||
<view class="menu rows ptb20" v-if="[2,3,4,5,6].includes(scope.item.status)">
|
||||
<view class="key fs0 c333">收货地址</view>
|
||||
<view class="value f1 ml20">
|
||||
<view class="c333 f28">收货地址</view>
|
||||
<view class="c333 f28">
|
||||
{{scope.item.address.province}}{{scope.item.address.city}}{{scope.item.address.country}}{{scope.item.address.detail}}
|
||||
</view>
|
||||
<view class="mt10 c666 f24">
|
||||
<text>姓名</text>
|
||||
<text>1397897890</text>
|
||||
<text>{{scope.item.address.name}}</text>
|
||||
<text>{{scope.item.address.mobile}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -209,10 +231,10 @@
|
|||
</view>
|
||||
<!-- 操作按钮 -->
|
||||
<view class="menu ptb20 df jcr" v-if="[1,2,6].includes(scope.item.status)">
|
||||
<template v-if="scope.item.status == 1">
|
||||
<template v-if="scope.item.status == 0">
|
||||
<view class="btn bar warmHollow plr30">修改价格</view>
|
||||
</template>
|
||||
<template v-if="scope.item.status == 2">
|
||||
<template v-if="scope.item.status == 1">
|
||||
<view class="btn bar warmHollow plr30">发货</view>
|
||||
</template>
|
||||
<template v-if="scope.item.status == 6">
|
||||
|
|
@ -231,6 +253,9 @@
|
|||
|
||||
<!-- 填充 -->
|
||||
<view class="fill" style="height: 30rpx;"></view>
|
||||
|
||||
<!-- 物流弹窗 -->
|
||||
<expressVue ref="expressRef" @confirm="handleExpressConfirm" />
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
|
|
@ -339,6 +339,5 @@ call_type 通话类型 2为视频，1是音频
|
|||
3. 钱包明细
|
||||
|
||||
|
||||
子账号不能登录app 并且区分身份标识
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import uni from '@dcloudio/vite-plugin-uni';
|
|||
|
||||
let target = 'http://91f.xyz:8080'
|
||||
// let target = 'http://liuyd.cpolar.top'
|
||||
// let target = 'http://pfrijh.natappfree.cc'
|
||||
// let target = ' http://nncdt2.natappfree.cc '
|
||||
|
||||
export default defineConfig({
|
||||
plugins: [uni()],
|
||||
|
|
|
|||
Loading…
Reference in New Issue