From f6bdf195c0f3de9c97f3184cc7e680b649ea7e4a Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Wed, 1 Jun 2022 15:45:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=99=9A=E6=8B=9F?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                        | 1 +
 src/common/api/ad.js              | 4 ++--
 src/pages/account/index.vue       | 6 +++++-
 src/pages/index/index.vue         | 3 +--
 src/pages/order/logisitcsInfo.vue | 6 ++++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index ee0a644..7aed379 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ node_modules/
 unpackage/
 dist/
 .history/
+.hbuilderx/
 env.js
 yarn.lock
 
diff --git a/src/common/api/ad.js b/src/common/api/ad.js
index 0db2f67..7d2c6de 100644
--- a/src/common/api/ad.js
+++ b/src/common/api/ad.js
@@ -6,13 +6,13 @@
  * @Description: file content
  */
 
-import {ToAsyncAwait, MsbRequest, MsbRequestTk} from '@/common/utils';
+import {ToAsyncAwait, MsbRequest} from '@/common/utils';
 import { AD_PLATFORM } from '../dicts/ad';
 
 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,
 	...params
 }))
\ No newline at end of file
diff --git a/src/pages/account/index.vue b/src/pages/account/index.vue
index 7dad490..41c1230 100644
--- a/src/pages/account/index.vue
+++ b/src/pages/account/index.vue
@@ -3,7 +3,7 @@
 	components: { UiCell },: ch
  * @Date: 2019-08-22 19:41:20
  * @LastEditors: ch
- * @LastEditTime: 2022-05-24 09:57:07
+ * @LastEditTime: 2022-06-01 15:15:11
  * @Description: file content
 -->
 <template>
@@ -135,6 +135,10 @@ page {
 		top: 10rpx;
 		z-index: 99;
 		border: 1px solid #fff;
+
+		/*  #ifndef  H5  */
+		top: 90rpx;
+		/*  #endif  */
 	}
 	&--cell{
 		border: 0;
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 1052a06..8257a86 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -59,8 +59,7 @@ export default {
 		return {
 			scrollTop : 0,
 			bannerList: [],
-			categoryList : [
-			],
+			categoryList : [],
 			recommendedGoodsList : [],
 			seckillData : {activityTimeVO:{}}
 
diff --git a/src/pages/order/logisitcsInfo.vue b/src/pages/order/logisitcsInfo.vue
index 7109673..af68fb1 100644
--- a/src/pages/order/logisitcsInfo.vue
+++ b/src/pages/order/logisitcsInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-18 15:28:14
  * @LastEditors: ch
- * @LastEditTime: 2022-05-17 17:55:56
+ * @LastEditTime: 2022-06-01 15:34:49
  * @Description: file content
 -->
 <template>
@@ -11,7 +11,7 @@
 			<UiGoodsInfo :class="idx === orderInfo.products.length-1 ? 'goods-info__last' : ''" :key="item.orderProductId"
 				 v-for="(item, idx) in orderInfo.products" :data="item"></UiGoodsInfo>
 		</UiWhiteBox>
-		<UiWhiteBox class="company">
+		<UiWhiteBox class="company" v-if="orderInfo.orderType !== ORDER_TYPE.VIRTUAL">
 			<text class="company--name">{{orderInfo.companyName}}</text>
 			<view class="company--no">
 				<text>{{orderInfo.trackingNo}}</text>
@@ -38,10 +38,12 @@ import UiGoodsInfo from '@/components/UiGoodsInfo.vue'
 import UiWhiteBox from '@/components/UiWhiteBox.vue'
 import {ApiGetOrderLogistics} from '@/common/api/order';
 import UiCopy from '../../components/UiCopy.vue';
+import {ORDER_TYPE} from '@/common/dicts/order';
 export default {
 	components: { UiWhiteBox, UiGoodsInfo, UiCopy },
 	data(){
 		return {
+			ORDER_TYPE,
 			orderInfo : {}
 		}
 	},