1

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<EFBFBD><EFBFBD><EFBFBD>ܿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD>չ ]
 	// +----------------------------------------------------------------------
 	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
 	// +----------------------------------------------------------------------
-	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// | Licensed CRMEB<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɲ<EFBFBD><EFBFBD><EFBFBD>ȥ<EFBFBD><EFBFBD>CRMEB<EFBFBD><EFBFBD><EFBFBD>ذ<EFBFBD>Ȩ
 	// +----------------------------------------------------------------------
 	// | 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;

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">

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;

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>

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'>