521bug修改

pages/user/myOrder/activityOrderDetail.vue

@@ -974,7 +974,7 @@
 
 			call() {
 				uni.makePhoneCall({
-					phoneNumber:this.shItem.mobilePhone// this.orderData.shopInfo.mobilePhone
+					phoneNumber:this.orderData.shopInfo.mobilePhone//this.shItem.mobilePhone// this.orderData.shopInfo.mobilePhone
 				});
 			},
 

pages/user/myOrder/mallOrderDetail.vue

@@ -926,7 +926,7 @@
 			call() {
 				//this.shItem
 				uni.makePhoneCall({
-					phoneNumber:this.shItem.mobilePhone// this.orderData.shopInfo.mobilePhone
+					phoneNumber:this.orderData.shopInfo.mobilePhone//this.shItem.mobilePhone// this.orderData.shopInfo.mobilePhone
 				});
 			},
 

pages/user/myOrder/myOrder.vue

@@ -55,6 +55,7 @@
 						<view class="defer" v-if="item.PayType == 1"  @click.stop="pay(item)">立即支付</view>
 					</view>
 				</view>
+				<nodata v-show="isload&&items.length==0"></nodata>
 			</view>
 			
 			<view v-if="tabIndex==6" class="afterSales">
@@ -90,9 +91,12 @@
 					</view>
 					
 				</view>
+				<nodata v-show="RefundList.length==0&&isload"></nodata>
+				
+				
 			</view>
-
-			<nodata v-show="RefundList.length==0&&isload"></nodata>
+			
+			
 		</view>
 		<!-- 手机号授权 -->
 			<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">

pages/user/myOrder/paintOrderDetail.vue

@@ -887,7 +887,7 @@
 
 			call() {
 				uni.makePhoneCall({
-					phoneNumber:this.shItem.mobilePhone// this.orderData.shopInfo.mobilePhone
+					phoneNumber:this.orderData.shopInfo.mobilePhone//this.shItem.mobilePhone// this.orderData.shopInfo.mobilePhone
 				});
 			},
 

pages/user/user.vue

@@ -79,7 +79,7 @@
 		
 	<view class="padingBox">
 		<view class="headerBox2">
-			<view class="headerBox">
+			<view class="headerBox" v-if="showSetting.isShowCoupon||showSetting.isShowIntergral||showSetting.isShowCard">
 				<view class="quan" @click="gonavigateTo('../index/discountCard')" v-if="showSetting.isShowCoupon">
 					<view class="numStr">{{numList.count?numList.count:0}}</view>
 					<view class="nameStr">优惠券</view>

utils/request.js

@@ -8,8 +8,8 @@
 import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
-//const baseUrl=extConfig.url+'/'
-const baseUrl='http://api2.dms.66km.com.cn/'
+const baseUrl=extConfig.url+'/'
+//const baseUrl='http://api2.dms.66km.com.cn/'
 //const baseUrl='http://dms.66km.com.cn/'
 //const baseUrl='http://192.168.1.18:20187/' 
 //const baseUrl='https://store-api.qdbtl.cn/'