From a4427b6f1dfbac1dc56893c11e90d0a5027d2d55 Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Wed, 29 May 2024 00:20:44 +0800
Subject: [PATCH] 1

---
 components/alert/index.vue      | 10 +++++-----
 components/orderGoods/index.vue |  2 +-
 pages/order_details/index.vue   |  6 +++++-
 pages/users/refund/detail.vue   | 11 ++++++-----
 pages/users/user_info/index.vue |  4 ++--
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/components/alert/index.vue b/components/alert/index.vue
index 64b525f..70bd2ea 100644
--- a/components/alert/index.vue
+++ b/components/alert/index.vue
@@ -1,21 +1,21 @@
 <template>
 	<view class="alert-wrapper" :style="viewColor">
 		<view class="alert-box">
-			<image :src="basePicPath1+'/static/images/success.png'" mode=""></image>
+			<!-- <image :src="basePicPath1+'/static/images/success.png'" mode=""></image> -->
 			<!-- <image :src="domain+'/static/diy/success'+keyColor+'.png'" mode=""></image> -->
 			<view class="txt">{{msg}}</view>
-			<view class="btn" @click="close">ÎÒÖªµÀÁË</view>
+			<view class="btn" @click="close">我知�了</view>
 		</view>
 	</view>
 </template>
 
 <script>
 	// +----------------------------------------------------------------------
-	// | CRMEB [ CRMEB¸³ÄÜ¿ª·¢Õߣ¬ÖúÁ¦ÆóÒµ·¢Õ¹ ]
+	// | CRMEB [ CRMEB���ܿ����ߣ�������ҵ��չ ]
 	// +----------------------------------------------------------------------
 	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
 	// +----------------------------------------------------------------------
-	// | Licensed CRMEB²¢²»ÊÇ×ÔÓÉÈí¼þ£¬Î´¾­Ðí¿É²»ÄÜÈ¥µôCRMEBÏà¹Ø°æȨ
+	// | Licensed CRMEB����������������δ�����ɲ���ȥ��CRMEB���ذ�Ȩ
 	// +----------------------------------------------------------------------
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
@@ -65,7 +65,7 @@
 		align-items: center;
 		justify-content: center;
 		width: 500rpx;
-		height: 540rpx;
+		height: 340rpx;
 		background-color: #fff;
 		border-radius: 10rpx;
 		font-size: 34rpx;
diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue
index 38dc0e8..aced6d1 100644
--- a/components/orderGoods/index.vue
+++ b/components/orderGoods/index.vue
@@ -2,7 +2,7 @@
 	<view class="orderGoods" :style="viewColor">
 		<view class='goodWrapper' :class="'item'+orderData.order_type">
 			<view v-if="orderData.order_type == 1" class="title acea-row row-between-wrapper">
-				<view class="item-status" :class="'status'+evaluate">{{evaluate == 0 ? '待核销' : '已核销'}}</view>
+				<view class="item-status" :class="'status'+evaluate">{{evaluate == -1?'退款':evaluate == 0 ? '待核销' : '已核销'}}</view>
 				<view v-if="evaluate != 0 && orderData.verify_time" class="item-date">{{orderData.verify_time}}</view>
 			</view>
 			<view v-for="(item,index) in cartInfo" :key="index">
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 0272d1c..8e948af 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view :style="viewColor">
+	<view :style="viewColor" class="index">
 		<view class="topContent">
 			
 			<view class="sys-head skeleton-rect" :style="{ height: statusBarHeight }"></view>
@@ -912,6 +912,10 @@
 	}
 </script>
 <style scoped lang="scss">
+	.index{
+	
+		overflow-x: hidden;
+	}
 	.topContent{
 		position: fixed;
 		top:0;
diff --git a/pages/users/refund/detail.vue b/pages/users/refund/detail.vue
index 1da22b1..0e280f6 100644
--- a/pages/users/refund/detail.vue
+++ b/pages/users/refund/detail.vue
@@ -126,24 +126,25 @@
 		</view>
 		<view class="btn-wrapper">
 			<block v-if="type==-1">
-				<view class="btn gray" @click="goService">�系商家</view>
+				<!-- @click="goService" -->
+				<button open-type="contact" class="btn gray">�系商家</button>
 				<view class="btn" @click="applyAgain(detail)">�次申请</view>
 			</block>
 			<block v-else-if="type==1">
 				<view class="btn gray" @click="cancelSales">�消售�</view>
-				<view class="btn gray" @click="goService">�系商家</view>
+				<button open-type="contact" class="btn gray">�系商家</button>
 				<view class="btn" @click="goPage">退回商�</view>
 			</block>
 			<block v-else-if="type==2">
-				<view class="btn gray" @click="goService">�系商家</view>
+				<button open-type="contact" class="btn gray" >�系商家</button>
 				<view class="btn" @click="go">查看物�</view>
 			</block>
 			<block v-else-if="type==0">
 				<view class="btn gray" @click="cancelSales">�消售�</view>
-				<view class="btn" @click="goService">�系商家</view>
+				<button open-type="contact" class="btn">�系商家</button>
 			</block>
 			<block v-else>
-				<view class="btn" @click="goService">�系商家</view>
+				<button open-type="contact" class="btn">�系商家</button>
 			</block>
 		</view>
 	</view>
diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue
index 1eaaf19..c5bbd66 100644
--- a/pages/users/user_info/index.vue
+++ b/pages/users/user_info/index.vue
@@ -78,13 +78,13 @@
 							<text class='iconfont icon-you'></text>
 						</navigator>
 					</view>
-					<view class='item acea-row row-between-wrapper'>
+					<!-- <view class='item acea-row row-between-wrapper'>
 						<view class="itemTitle">登录密�</view>
 						<view class='input acea-row row-between-wrapper' @click="changePwd">
 							<input type='text' placeholder="修改登录密�" disabled='true' class='id'></input>
 							<text class='iconfont icon-you'></text>
 						</view>
-					</view>
+					</view> -->
 					<view class='item acea-row row-between-wrapper'>
 						<view class="itemTitle">地�管�</view>
 						<navigator url="/pages/users/user_address_list/index" hover-class="none" class='input acea-row row-between-wrapper'>