twt 2 年之前
父节点
当前提交
828ab283e8

+ 15 - 3
components/homenav/nav.vue

@@ -6,10 +6,11 @@
 			<view class="zdyNav">
 				<view class="zdyNavLeft">
 					<image src="../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback"></image>
+					<view class="navsx"></view>
 					<image src="../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image>
 				</view>
 				<view class="zdyNavTitle">{{title}}</view>
-				<view style="width: 100px;"></view>
+				<view style="width: 250rpx;"></view>
 			</view>
 		</view>
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
@@ -77,8 +78,14 @@ export default {
 	.backImg{
 		width: 44rpx;
 		height: 44rpx;
-		margin-left: 10rpx;
-		margin-right: 20rpx;
+		/* margin-left: 10rpx; */
+		/* margin-right: 20rpx; */
+	}
+	.navsx{
+		width: 2rpx;
+		height: 44rpx;
+		background: #e1e1e1;
+		margin: 0 26rpx 0rpx 18rpx;
 	}
 	.homeImg{
 		width: 44rpx;
@@ -88,6 +95,11 @@ export default {
 	.zdyNavLeft{
 		display: flex;
 		align-items: center;
+        border: 1px solid #e1e1e1;
+		margin-left: 15rpx;
+		border-radius: 35rpx;
+		padding: 10rpx 23rpx 8rpx 13rpx;
+		
 	}
 	.zdyNavTitle{
 		width: 100vw;

+ 4 - 4
pages/index/index.vue

@@ -571,9 +571,9 @@
 			 },
 			 getWxOpenID(e){
 				 var that=this;
-				 uni.showLoading({
-					title: '加载中'
-				 })
+				 // uni.showLoading({
+					// title: '加载中'
+				 // })
 				 this.$http('miniApp2/sys/getWxOpenID', {
 				   code:e.code,
 				   unionId:this.unionId,
@@ -582,7 +582,7 @@
 					console.log(res.code);
 					console.log("授权信息")
 					console.log(res)
-					 uni.hideLoading();
+					 //uni.hideLoading();
 					if(res.code!=0){
 						 //uni.hideLoading();
 						 var msg=res.msg

+ 5 - 4
pages/user/myOrder/activityOrderDetail.vue

@@ -2,7 +2,7 @@
 	<view class="box">
 	
 		<!-- 自定义导航 -->
-		<view class="zdyNavBox">
+	<!-- 	<view class="zdyNavBox">
 			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 			<view class="zdyNav">
 				<view class="zdyNavLeft">
@@ -14,8 +14,8 @@
 			</view>
 		</view>
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-		<view style="height: 44px;"></view>
-		
+		<view style="height: 44px;"></view> -->
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
 		
 		<view class="top" :style="{background:'#'+themeColor}">
 			<view class="orderState">
@@ -214,9 +214,10 @@
 
 <script>
 	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue"
+	import homenav from "@/components/homenav/nav.vue"
 	export default {
 		components: {
-			tkiQrcode
+			tkiQrcode,homenav
 		},
 		data() {
 			return {

+ 5 - 4
pages/user/myOrder/mallOrderDetail.vue

@@ -2,7 +2,7 @@
 	<view class="box">
 	
 		<!-- 自定义导航 -->
-		<view class="zdyNavBox">
+		<!-- <view class="zdyNavBox">
 			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 			<view class="zdyNav">
 				<view class="zdyNavLeft">
@@ -14,8 +14,8 @@
 			</view>
 		</view>
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-		<view style="height: 44px;"></view>
-		
+		<view style="height: 44px;"></view> -->
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
 		
 		<view class="top" :style="{background:'#'+themeColor}">
 			<view class="orderState">
@@ -242,9 +242,10 @@
 
 <script>
 	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue"
+	import homenav from "@/components/homenav/nav.vue"
 	export default {
 		components: {
-			tkiQrcode
+			tkiQrcode,homenav
 		},
 		data() {
 			return {

+ 5 - 4
pages/user/myOrder/paintOrderDetail.vue

@@ -2,7 +2,7 @@
 	<view class="box">
 	
 		<!-- 自定义导航 -->
-		<view class="zdyNavBox">
+		<!-- <view class="zdyNavBox">
 			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 			<view class="zdyNav">
 				<view class="zdyNavLeft">
@@ -14,8 +14,8 @@
 			</view>
 		</view>
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-		<view style="height: 44px;"></view>
-		
+		<view style="height: 44px;"></view> -->
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
 		
 		<view class="top" :style="{background:'#'+themeColor}">
 			<view class="orderState">
@@ -222,9 +222,10 @@
 
 <script>
 	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue"
+	import homenav from "@/components/homenav/nav.vue"
 	export default {
 		components: {
-			tkiQrcode
+			tkiQrcode,homenav
 		},
 		data() {
 			return {