fix: 修复虚拟商品优化问题

feature/ad-0531-ch
ch 2 years ago
parent 02552acb69
commit f6bdf195c0

1
.gitignore vendored

@ -4,6 +4,7 @@ node_modules/
unpackage/ unpackage/
dist/ dist/
.history/ .history/
.hbuilderx/
env.js env.js
yarn.lock yarn.lock

@ -6,13 +6,13 @@
* @Description: file content * @Description: file content
*/ */
import {ToAsyncAwait, MsbRequest, MsbRequestTk} from '@/common/utils'; import {ToAsyncAwait, MsbRequest} from '@/common/utils';
import { AD_PLATFORM } from '../dicts/ad'; import { AD_PLATFORM } from '../dicts/ad';
const BASE_URL = '/mall/marketing'; const BASE_URL = '/mall/marketing';
// 获取广告列表 // 获取广告列表
export const ApiGetAdList = (params) => ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/advertisement`, { export const ApiGetAdList = (params) => ToAsyncAwait(MsbRequest.get(`${BASE_URL}/app/advertisement`, {
platform : AD_PLATFORM.MOBILE, platform : AD_PLATFORM.MOBILE,
...params ...params
})) }))

@ -3,7 +3,7 @@
components: { UiCell },: ch components: { UiCell },: ch
* @Date: 2019-08-22 19:41:20 * @Date: 2019-08-22 19:41:20
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-05-24 09:57:07 * @LastEditTime: 2022-06-01 15:15:11
* @Description: file content * @Description: file content
--> -->
<template> <template>
@ -135,6 +135,10 @@ page {
top: 10rpx; top: 10rpx;
z-index: 99; z-index: 99;
border: 1px solid #fff; border: 1px solid #fff;
/* #ifndef H5 */
top: 90rpx;
/* #endif */
} }
&--cell{ &--cell{
border: 0; border: 0;

@ -59,8 +59,7 @@ export default {
return { return {
scrollTop : 0, scrollTop : 0,
bannerList: [], bannerList: [],
categoryList : [ categoryList : [],
],
recommendedGoodsList : [], recommendedGoodsList : [],
seckillData : {activityTimeVO:{}} seckillData : {activityTimeVO:{}}

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-04-18 15:28:14 * @Date: 2022-04-18 15:28:14
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-05-17 17:55:56 * @LastEditTime: 2022-06-01 15:34:49
* @Description: file content * @Description: file content
--> -->
<template> <template>
@ -11,7 +11,7 @@
<UiGoodsInfo :class="idx === orderInfo.products.length-1 ? 'goods-info__last' : ''" :key="item.orderProductId" <UiGoodsInfo :class="idx === orderInfo.products.length-1 ? 'goods-info__last' : ''" :key="item.orderProductId"
v-for="(item, idx) in orderInfo.products" :data="item"></UiGoodsInfo> v-for="(item, idx) in orderInfo.products" :data="item"></UiGoodsInfo>
</UiWhiteBox> </UiWhiteBox>
<UiWhiteBox class="company"> <UiWhiteBox class="company" v-if="orderInfo.orderType !== ORDER_TYPE.VIRTUAL">
<text class="company--name">{{orderInfo.companyName}}</text> <text class="company--name">{{orderInfo.companyName}}</text>
<view class="company--no"> <view class="company--no">
<text>{{orderInfo.trackingNo}}</text> <text>{{orderInfo.trackingNo}}</text>
@ -38,10 +38,12 @@ import UiGoodsInfo from '@/components/UiGoodsInfo.vue'
import UiWhiteBox from '@/components/UiWhiteBox.vue' import UiWhiteBox from '@/components/UiWhiteBox.vue'
import {ApiGetOrderLogistics} from '@/common/api/order'; import {ApiGetOrderLogistics} from '@/common/api/order';
import UiCopy from '../../components/UiCopy.vue'; import UiCopy from '../../components/UiCopy.vue';
import {ORDER_TYPE} from '@/common/dicts/order';
export default { export default {
components: { UiWhiteBox, UiGoodsInfo, UiCopy }, components: { UiWhiteBox, UiGoodsInfo, UiCopy },
data(){ data(){
return { return {
ORDER_TYPE,
orderInfo : {} orderInfo : {}
} }
}, },

Loading…
Cancel
Save