From a68b87d440e9e347791b8688319080c77942165e Mon Sep 17 00:00:00 2001
From: liqianjin <949671634@qq.com>
Date: Mon, 27 Mar 2023 14:32:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diy-components/diy-member-my-order.vue    | 34 +++++++++---------
 pages/goods/detail.vue                        | 10 +++---
 pages/order/detail.vue                        | 20 +++++------
 pages_promotion/fenxiao/bill.vue              |  5 ++-
 pages_promotion/fenxiao/index.vue             | 36 +++++++++----------
 pages_tool/member/balance.vue                 |  8 ++---
 6 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/components/diy-components/diy-member-my-order.vue b/components/diy-components/diy-member-my-order.vue
index 2edcfea..8d6de34 100644
--- a/components/diy-components/diy-member-my-order.vue
+++ b/components/diy-components/diy-member-my-order.vue
@@ -58,23 +58,23 @@
 					</view>
 					<view class="title">待使用</view>
 				</view>
-				<view class="item-wrap" @click="redirect('/pages_tool/order/activist')">
-					<view class="icon-block">
-						<template v-if="value.style == 3">
-							<image :src="$util.img('public/uniapp/member/order/refunding.png')" mode="widthFix"></image>
-							<view class="icon-shade" :style="'-webkit-mask-image: url(' + $util.img('public/uniapp/member/order/refunding_shade.png') + ')'"></view>
-						</template>
-						<template v-else>
-							<diy-icon
-								:icon="value.icon.refunding.icon"
-								v-if="value.icon.refunding"
-								:value="value.icon.refunding.style ? value.icon.refunding.style : null"
-							></diy-icon>
-						</template>
-						<text v-if="orderNum.refunding > 0" class="order-num color-base-bg price-font">{{ orderNum.refunding > 99 ? '99+' : orderNum.refunding }}</text>
-					</view>
-					<view class="title">售后</view>
-				</view>
+<!--				<view class="item-wrap" @click="redirect('/pages_tool/order/activist')">-->
+<!--					<view class="icon-block">-->
+<!--						<template v-if="value.style == 3">-->
+<!--							<image :src="$util.img('public/uniapp/member/order/refunding.png')" mode="widthFix"></image>-->
+<!--							<view class="icon-shade" :style="'-webkit-mask-image: url(' + $util.img('public/uniapp/member/order/refunding_shade.png') + ')'"></view>-->
+<!--						</template>-->
+<!--						<template v-else>-->
+<!--							<diy-icon-->
+<!--								:icon="value.icon.refunding.icon"-->
+<!--								v-if="value.icon.refunding"-->
+<!--								:value="value.icon.refunding.style ? value.icon.refunding.style : null"-->
+<!--							></diy-icon>-->
+<!--						</template>-->
+<!--						<text v-if="orderNum.refunding > 0" class="order-num color-base-bg price-font">{{ orderNum.refunding > 99 ? '99+' : orderNum.refunding }}</text>-->
+<!--					</view>-->
+<!--					<view class="title">售后</view>-->
+<!--				</view>-->
 			</view>
 		</view>
 		<ns-login ref="login"></ns-login>
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 040fb04..5877513 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -72,11 +72,11 @@
 											.split('.')[1]
 									}}
 								</text>
-								<view class="member-price-wrap">
-									<text class="unit price-font">原价</text>
-									<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
-									<text class="money price-font">{{ goodsSkuDetail.price }}</text>
-								</view>
+<!--								<view class="member-price-wrap">-->
+<!--									<text class="unit price-font">原价</text>-->
+<!--									<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>-->
+<!--									<text class="money price-font">{{ goodsSkuDetail.price }}</text>-->
+<!--								</view>-->
 							</template>
 							<template v-else>
 								<text class="price price-font">
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 3084936..04d17ca 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -204,16 +204,16 @@
 						</view>
 					</view>
 					
-					<view class="goods-action">
-						<block v-if="orderData.is_enable_refund">
-							<view @click="goRefund(goodsItem.order_goods_id)" v-if="orderData.order_scene == 'online' && (goodsItem.refund_status == 0 || goodsItem.refund_status == -1)">
-								<view class="order-box-btn" v-if="orderData.promotion_type != 'blindbox'">{{ orderData.order_status == 10 ? '申请售后' : '申请退款' }}</view>
-							</view>
-						</block>
-						<view @click="goRefundDetail(goodsItem.order_goods_id)" v-if="goodsItem.refund_status != 0 && goodsItem.refund_status != -1">
-							<view class="order-box-btn">{{ orderData.order_status == 10 ? '查看售后' : '查看退款' }}</view>
-						</view>
-					</view>
+<!--					<view class="goods-action">-->
+<!--						<block v-if="orderData.is_enable_refund">-->
+<!--							<view @click="goRefund(goodsItem.order_goods_id)" v-if="orderData.order_scene == 'online' && (goodsItem.refund_status == 0 || goodsItem.refund_status == -1)">-->
+<!--								<view class="order-box-btn" v-if="orderData.promotion_type != 'blindbox'">{{ orderData.order_status == 10 ? '申请售后' : '申请退款' }}</view>-->
+<!--							</view>-->
+<!--						</block>-->
+<!--						<view @click="goRefundDetail(goodsItem.order_goods_id)" v-if="goodsItem.refund_status != 0 && goodsItem.refund_status != -1">-->
+<!--							<view class="order-box-btn">{{ orderData.order_status == 10 ? '查看售后' : '查看退款' }}</view>-->
+<!--						</view>-->
+<!--					</view>-->
 				</view>
 			</view>
 		</view>
diff --git a/pages_promotion/fenxiao/bill.vue b/pages_promotion/fenxiao/bill.vue
index 3b49895..14101fb 100644
--- a/pages_promotion/fenxiao/bill.vue
+++ b/pages_promotion/fenxiao/bill.vue
@@ -48,9 +48,12 @@ export default {
 		}, 1000);
 		
 	},
+  onLoad(res){
+    this.type = res.type
+  },
 	methods: {
 		getData(mescroll) {
-      this.type = this.$route.query.type;
+      // this.type = this.$route.query.type;
 			if (mescroll.num == 1) {
 				this.accountList = [];
 			}
diff --git a/pages_promotion/fenxiao/index.vue b/pages_promotion/fenxiao/index.vue
index c34c853..1d6897a 100644
--- a/pages_promotion/fenxiao/index.vue
+++ b/pages_promotion/fenxiao/index.vue
@@ -150,24 +150,24 @@
 						<view class="desc">{{ fenxiaoWords.concept }}商品</view>
 					</view>
 				</view>
-				<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/ranking_list', {type: 'profit'})">
-					<view class="icon-wrap">
-						<image :src="$util.img('public/uniapp/fenxiao/index/commission_rank.png')" mode="widthFix"></image>
-					</view>
-					<view class="info">
-						<view class="title">{{ fenxiaoWords.account }}排行</view>
-						<view class="desc">您的排名为第{{profitRanking}}位</view>
-					</view>
-				</view>
-				<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/ranking_list', {type: 'invited_num'})">
-					<view class="icon-wrap">
-						<image :src="$util.img('public/uniapp/fenxiao/index/promoter_rank.png')" mode="widthFix"></image>
-					</view>
-					<view class="info">
-						<view class="title">推广人排行</view>
-						<view class="desc">您的排名为{{ invitedNumRanking }}位</view>
-					</view>
-				</view>
+<!--				<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/ranking_list', {type: 'profit'})">-->
+<!--					<view class="icon-wrap">-->
+<!--						<image :src="$util.img('public/uniapp/fenxiao/index/commission_rank.png')" mode="widthFix"></image>-->
+<!--					</view>-->
+<!--					<view class="info">-->
+<!--						<view class="title">{{ fenxiaoWords.account }}排行</view>-->
+<!--						<view class="desc">您的排名为第{{profitRanking}}位</view>-->
+<!--					</view>-->
+<!--				</view>-->
+<!--				<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/ranking_list', {type: 'invited_num'})">-->
+<!--					<view class="icon-wrap">-->
+<!--						<image :src="$util.img('public/uniapp/fenxiao/index/promoter_rank.png')" mode="widthFix"></image>-->
+<!--					</view>-->
+<!--					<view class="info">-->
+<!--						<view class="title">推广人排行</view>-->
+<!--						<view class="desc">您的排名为{{ invitedNumRanking }}位</view>-->
+<!--					</view>-->
+<!--				</view>-->
 				<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/level')" v-if="levelList.length">
 					<view class="icon-wrap">
 						<image :src="$util.img('public/uniapp/fenxiao/index/team_reward.png')" mode="widthFix"></image>
diff --git a/pages_tool/member/balance.vue b/pages_tool/member/balance.vue
index c4399cd..b5018c2 100644
--- a/pages_tool/member/balance.vue
+++ b/pages_tool/member/balance.vue
@@ -24,10 +24,10 @@
 					<view class="num price-font">{{  balanceInfo.balance_money|moneyFormat }}</view>
 					<view class="font-size-tag">现金消费券（元）</view>
 				</view>
-				<view class="flex-item">
-					<view class="num price-font">{{ balanceInfo.balance|moneyFormat }}</view>
-					<view class="font-size-tag">储值消费券（元）</view>
-				</view>
+<!--				<view class="flex-item">-->
+<!--					<view class="num price-font">{{ balanceInfo.balance|moneyFormat }}</view>-->
+<!--					<view class="font-size-tag">储值消费券（元）</view>-->
+<!--				</view>-->
 			</view>
 		</view>