1

pages.json

@@ -181,8 +181,7 @@
 		{
 		    "path" : "pages/qianggou/productList",
 		    "style" : {
-		    	"navigationBarTitleText": "抢购",
-		    	"navigationBarBackgroundColor": "#FFFFFF",
+		    	"navigationStyle": "custom",
 				"onReachBottomDistance":100
 		    }
 		},
@@ -226,8 +225,7 @@
 		{
 		    "path" : "pages/ConfirmOrder/ConfirmOrder",
 		    "style" : {
-				"navigationBarTitleText": "确认订单",
-				"navigationBarBackgroundColor": "#FFFFFF"
+				"navigationStyle": "custom"
 			}
 		},
 		{

pages/ConfirmOrder/ConfirmOrder.scss

@@ -8,7 +8,7 @@
 	background-color: #FFFFFF;
 	margin:0 24rpx;
 	overflow: hidden;
-	margin-top:24rpx;
+	margin-top:110rpx;
 	border-radius: 8rpx;
 	.address-list{
 		width: 100%;

pages/ConfirmOrder/ConfirmOrder.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="page">
+		<navbar :title="'确认订单'" :isCenter="true" :back="true" @onBack="backHandle"></navbar>
 		<view v-if="qgSuccess">
 			<!-- 地址 -->
 			<view class="address-data">
@@ -138,9 +139,9 @@
 
 <script>
 	import {getAddrList,createOrder} from '@/common/api.js'
-	
+	import navbar from '@/components/navbar.vue'
 	export default {
-	
+		components:{navbar},
 		data() {
 			return {
 				scrollTop: 0,
@@ -172,11 +173,7 @@
 			close() {
 			  this.show = false
 			},
-			backHandle(){
-				uni.navigateTo({
-					url:'/pages/qianggou/productList'
-				})
-			},
+		
 			/**
 			 * 提交订单
 			 */
@@ -196,17 +193,17 @@
 					console.log(res,"==")
 					if(res.code==1){
 						this.show = true;
-						setTimeout(()=>{
-							uni.redirectTo({
-							  url: '/pages/qianggou/productList',
-							})
-						},1000)
 					
 					}else{
 						this.qgSuccess = false;
 					}
 				})
 			},
+			backHandle(){
+				uni.redirectTo({
+				  url: '/pages/qianggou/productList',
+				})
+			},
 			
 			onSkip(type){
 				switch (type){
@@ -216,12 +213,12 @@
 					})
 					break;
 				  case 'cangku':
-					// uni.navigateTo({
-					//   url: '/pages/warehouse/buy?type=-1',
-					// })
 					uni.navigateTo({
-					  url: '/pages/qianggou/productList',
+					  url: '/pages/warehouse/buy?type=-1',
 					})
+					// uni.navigateTo({
+					//   url: '/pages/qianggou/productList',
+					// })
 					break;
 				}
 			},

pages/home/home.vue

@@ -4,7 +4,7 @@
 			
 			<!-- 搜索 -->
 			<view class="head-search">
-				<navbar :title="'首页'" :isCenter="true" :back="true"></navbar>
+				<navbar :title="'首页'" :isCenter="true" :back="false"></navbar>
 				<view class="icon-info" @click="onSkip('menu')">
 					<u-icon name="grid" size="26"></u-icon>
 				</view>
@@ -140,7 +140,7 @@ export default {
 		// #endif
 	},
 	onLoad() {
-	  this.H5Login()
+	  // this.H5Login()
 	},
 	onPageScroll(e){
 		let scrollTop = e.scrollTop;

pages/qianggou/productList.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="page">
+		<navbar :title="'抢购列表'" :isCenter="true" :back="true" @onBack="backHandle"></navbar>
 		<u-sticky bgColor="#fff">
 		    <u-tabs 
 			@click="getPage"
@@ -49,6 +50,7 @@
 </template>
 
 <script>
+import navbar from '@/components/navbar.vue'
 import {getGoodsList} from '@/common/api.js'
 export default {
 	data(){
@@ -61,6 +63,7 @@ export default {
 			warehouse_id:null,
 		}
 	},
+	components:{navbar},
 	
 	methods:{
 		refrenshHandle(){
@@ -68,6 +71,11 @@ export default {
 			    url: '/pages/qianggou/productList?page='+this.page //写你的路径
 			});
 		},
+		backHandle(){
+			uni.switchTab({
+				url:"/pages/qianggou/qianggou"
+			})
+		},
 		getGoodsList(){
 			this.pagesList=[]
 			getGoodsList({page:this.page,limit:10,warehouse_id:this.warehouse_id}).then(res=>{
@@ -145,7 +153,7 @@ export default {
 .recommend-info{
 	width: 100%;
 	background-color: #f2f2f2;
-	margin-top:20rpx;
+	margin-top:110rpx;
 	.goods-list{
 		display: flex;
 		flex-wrap: wrap;

pages/warehouse/pay.vue

@@ -5,7 +5,10 @@
 				<view class="flag">￥</view>
 				<view class="text">{{num}}</view>
 			</view>
-			<image src="../../static/image/copy.png" mode="widthFix"></image>
+			<image src="../../static/image/copy.png" mode="widthFix"
+			v-clipboard:copy="num"
+			    v-clipboard:success="(type) => onCopyResult('success')"
+			    v-clipboard:error="(type) => onCopyResult('error')"></image>
 		</view>
 		<view class="tabs">
 			<view :class="activeIndex==item.id?'tabsItem active':'tabsItem'" @click="getPay(item)" v-for="item in list4" :key="item.id">
@@ -21,7 +24,11 @@
 					</view>
 					<view class="content">
 						<text>{{yhk.bank_realname}}</text>
-						
+						<image 
+						v-clipboard:copy="yhk.bank_realname"
+						    v-clipboard:success="(type) => onCopyResult('success')"
+						    v-clipboard:error="(type) => onCopyResult('error')"
+						src="../../static/image/copy.png" mode="widthFix"></image>
 					</view>
 				</view>
 				<view class="list-input">
@@ -30,19 +37,24 @@
 					</view>
 					<view class="content">
 						<text>{{yhk.bank_mobile}}</text>
-						
+						<image
+						 v-clipboard:copy="yhk.bank_mobile"
+						     v-clipboard:success="(type) => onCopyResult('success')"
+						     v-clipboard:error="(type) => onCopyResult('error')"
+						 src="../../static/image/copy.png" mode="widthFix"></image>
 					</view>
 				</view>
 				<view class="list-input">
 					<view class="title">
 						<text>卡号</text>
 					</view>
-					<view class="content" 
+					<view class="content" >
+						<text>{{yhk.bank_no}}</text>
+						<image
 						 v-clipboard:copy="yhk.bank_no"
 						     v-clipboard:success="(type) => onCopyResult('success')"
-				    v-clipboard:error="(type) => onCopyResult('error')">
-						<!-- <text></text> -->
-						{{yhk.bank_no}}
+						     v-clipboard:error="(type) => onCopyResult('error')"
+						 src="../../static/image/copy.png" mode="widthFix"></image>
 					</view>
 				</view>
 				<view class="list-input">
@@ -51,7 +63,11 @@
 					</view>
 					<view class="content">
 						<text>{{yhk.bank_address}}</text>
-						
+						<image
+						 v-clipboard:copy="yhk.bank_address"
+						     v-clipboard:success="(type) => onCopyResult('success')"
+						     v-clipboard:error="(type) => onCopyResult('error')"
+						 src="../../static/image/copy.png" mode="widthFix"></image>
 					</view>
 				</view>
 				
@@ -251,6 +267,7 @@
 			padding: 0 4%;
 			height: 100rpx;
 			border-bottom: 2rpx solid #f6f6f6;
+			
 			.title{
 				display: flex;
 				align-items: center;
@@ -261,11 +278,17 @@
 					font-size: 26rpx;
 				}
 			}
+			image{
+				margin-left:10rpx;
+				width:30rpx;
+				height:auto;
+			}
 			.content{
 				display: flex;
 				align-items: center;
 				width: 70%;
 				height: 100%;
+				justify-content: space-between;
 				input{
 					width: 100%;
 					height: 100%;

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.1a42ebe2.js></script><script src=/static/js/index.b16753bf.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.1a42ebe2.js></script><script src=/static/js/index.577ed345.js></script></body></html>