Pārlūkot izejas kodu

Merge branch 'develop' of http://git.chelingzhu.com/chelingzhu-web/zxyj-mini-html into develop

lilei 4 gadi atpakaļ
vecāks
revīzija
4f3755b9ae
3 mainītis faili ar 11 papildinājumiem un 23 dzēšanām
  1. 7 5
      pages/order/LogList.vue
  2. 4 17
      pages/order/order.vue
  3. 0 1
      pages/order/orderDetail.vue

+ 7 - 5
pages/order/LogList.vue

@@ -13,7 +13,7 @@
 							<view class="order-log">
 								<view>
 									快递公司:<text class="address-title">{{item.logName}}</text>
-									<u-button class="btn-cont" @click="copyLogNum" style="float: right;" type="primary" shape="circle" size="mini">确认收货</u-button>
+									<text class="btn-cont" @click="copyLogNum" style="float: right;">确认收货</text>
 								</view>
 								<view>
 									<text>运单编号:</text>
@@ -24,7 +24,7 @@
 							<u-gap height="10" bg-color="#f8f8f8"></u-gap>
 							<view class="bundle-list" v-for="row in item.itemList" :key="row.id">
 								<view class="img-cont">
-									<image :src="row.icon?row.icon:'../../static/tabbar/user.png'"></image>
+									<image :src="row.icon?row.icon:'../../static/goods.png'"></image>
 								</view>
 								<view >
 									<view class="ellipsis-two">{{row.name}}</view>
@@ -105,8 +105,6 @@
 			}
 		},
 		onLoad() {
-			// 监听待办处理后刷新
-			uni.$on('refreshBl-handle', this.handleRefresh)
 			this.pageInit()
 		},
 		onUnload() {
@@ -369,7 +367,6 @@
 					}
 					>view {
 						&:last-child {
-							padding: 10upx 0;
 							flex: 1;
 							margin-left: 20upx;
 							display: flex;
@@ -385,6 +382,11 @@
 				.btn-cont {
 					width: 180upx;
 					height: 60upx;
+					float: right;
+					background-color: #2979ff;
+					color: #fff;
+					text-align: center;
+					border-radius: 100upx;
 					font-size: 30upx;
 				}
 				.price-text{

+ 4 - 17
pages/order/order.vue

@@ -64,20 +64,6 @@
 				</swiper-item>
 			</swiper>
 		</view>
-		 <!-- 查看物流弹窗 -->
-		<view>
-			<u-modal v-model="isShow" :show-title="false" confirm-text="好的">
-				<view class="slot-content">
-					<view>
-						快递公司:{{logData.logName}}
-					</view>
-					<view>
-						运单编号:{{logData.logNum}}
-						<u-button @click="copyLogNum" style="margin-left: 20upx;" shape="square" size="mini">复制</u-button>
-					</view>
-				</view>
-			</u-modal>
-		</view>
 	</view>
 </template>
 
@@ -91,7 +77,6 @@
 		},
 		data() {
 			return {
-				isShow: false, // 是否显示物流弹框
 				status: 'loadmore',
 				noDataText: '暂无数据',
 				tabList: [
@@ -316,7 +301,10 @@
 			},
 			// 查看物流
 			showLog (item) {
-				this.isShow = true
+				console.log(item,'111111')
+				uni.navigateTo({
+					url: "/pages/order/LogList?id="
+				})
 			},
 			// 复制运单编号 
 			copyLogNum () {
@@ -448,7 +436,6 @@
 					}
 					>view {
 						&:last-child {
-							padding: 10upx 0;
 							flex: 1;
 							margin-left: 20upx;
 							display: flex;

+ 0 - 1
pages/order/orderDetail.vue

@@ -224,7 +224,6 @@
 				
 				>view {
 					&:last-child {
-						padding: 10upx 0;
 						flex: 1;
 						margin-left: 20upx;
 						display: flex;