Merge branch 'dev' into pre-release

# Conflicts:
#	manifest.json
#	pages/admin/orderList/index.vue
#	pages/chat/customer_list/index.vue
#	pages/index/index.vue
#	pages/product/list/index.vue

pages.json

@@ -1316,7 +1316,9 @@
 				{
 					"path": "orderList/index",
 					"style": {
-						"navigationBarTitleText": "订单列表"
+						"navigationBarTitleText": "订单列表",
+						"enablePullDownRefresh": true
+
 					}
 				},
 				{

pages/admin/orderList/index.vue

@@ -466,6 +466,14 @@
 
 			this.getIndex();
 		},
+
+		onPullDownRefresh() {
+			this.loaded = false;
+			this.where.page = 1;
+			this.list = [];
+			this.getIndex();
+		},
+
 		methods: {
 			// 状态
 			statusParse(item) {
@@ -550,11 +558,12 @@
 							that.loaded = res.data.list.length < that.where.limit;
 							that.list.push.apply(that.list, res.data.list);
 							that.where.page = that.where.page + 1;
-							// console.log(that.list)
+							uni.stopPullDownRefresh();
 
 							// console.log(that.list);
 						},
 						err => {
+							uni.stopPullDownRefresh();
 							that.$util.Tips({
 								title: err
 							});

pages/chat/customer_list/index.vue

@@ -146,8 +146,6 @@
 						this.isAuto = true;
 						this.isShowAuth = true
 					}
-					// this.getList(this.mer_id)
-					// this.getList(res.data.service.mer_id, true);
 				});
 			},
 			onLoadFun() {

pages/product/shop_type_change/list.vue

@@ -25,7 +25,7 @@
 					<view class="shop-type-list-item-con">
 						<view class="shop-type-list-item-con-item">
 							<view class="shop-type-list-item-con-key">变更商户：</view>
-							<view class="shop-type-list-item-con-val">{{item.mer_name}}</view>
+							<view class="shop-type-list-item-con-val line1">{{item.mer_name}}</view>
 						</view>
 						<view class="shop-type-list-item-con-item">
 							<view class="shop-type-list-item-con-key">变更类型：</view>
@@ -171,6 +171,7 @@
 						.shop-type-list-item-con-val {
 							font-size: 26rpx;
 							color: #333333;
+							max-width: 360rpx;
 						}
 					}
 				}

pages/product/shop_type_change/progress.vue

@@ -15,7 +15,7 @@
 			<view class="shop-type-con-item">
 				<view class="shop-type-con-item-info">
 					<view class="shop-type-con-item-info-label">变更商户</view>
-					<view class="shop-type-con-item-info-val">{{form.mer_name}}</view>
+					<view class="shop-type-con-item-info-val line1">{{form.mer_name}}</view>
 				</view>
 				<view class="shop-type-con-item-info">
 					<view class="shop-type-con-item-info-label">变更类型</view>
@@ -171,6 +171,7 @@
 
 					.shop-type-con-item-info-label {
 						margin-right: 50rpx;
+						max-width: 400rpx;
 						font-weight: 400;
 						font-size: 28rpx;
 						color: #666666;
@@ -180,6 +181,7 @@
 						font-weight: 400;
 						font-size: 28rpx;
 						color: #333333;
+						max-width: 360rpx;
 					}
 				}
 

pages/store/detail/index.vue

@@ -23,7 +23,7 @@
 						{{ store.care ? '已关注' : '关注' }}
 					</button> -->
 					<view class="carebtn" @click="followToggle">
-						
+
 						<image src="@/static/images/gz.png" v-if=" store.care" mode="aspectFit"></image>
 						<image src="@/static/images/gz1.png" v-else mode="aspectFit"></image>
 					</view>
@@ -66,8 +66,8 @@
 			</navigator>
 			<view class="section info">
 				<view class="item very">
-					<view class="name">店铺简介</view>
+					<view class="name">店铺名称</view>
-					<view class="value">{{ store.mer_info }}</view>
+					<view class="value">{{ store.mer_name }}</view>
 				</view>
 				<view class="item very">
 					<view class="name">店铺地址</view>
@@ -75,14 +75,22 @@
 					<view v-if="store.lat && store.long && mer_location == 1" class="iconfont icon-dingwei"
 						@click="showMaoLocation(store.lat, store.long)"></view>
 				</view>
+
 				<view v-if="store.service_phone" class="item">
 					<view class="name">联系电话</view>
 					<view class="value">{{ store.service_phone }}</view>
 				</view>
+
 				<view class="item">
 					<view class="name">开店时间</view>
 					<view class="value">{{ store.create_time | dateFormat }}</view>
 				</view>
+
+				<view class="item">
+					<view class="name">营业时间</view>
+					<view class="value">{{ store.mer_info.mer_take_time[0] +"-"+ store.mer_info.mer_take_time[1] }}
+					</view>
+				</view>
 			</view>
 			<view :class="{ mask: popupShow }" @click="popupShow = false"></view>
 			<view :class="{ 'popup-active': popupShow }" class="popup-qrcode">
@@ -369,9 +377,10 @@
 	.carebtn {
 		width: 136rpx;
 		height: 52rpx;
-		
+
 		margin-top: -35rpx;
 		margin-right: 30rpx;
+
 		image {
 			width: 100%;
 			height: 100%;
@@ -388,7 +397,7 @@
 			border-radius: 10rpx;
 			margin-bottom: 20rpx;
 			background-color: #ffffff;
-			border-radius: 21rpx 21rpx ;
+			border-radius: 21rpx 21rpx;
 		}
 
 		.head {

pages/withdrawal/index.vue

@@ -128,7 +128,7 @@
 				<text>点击提现</text>
 			</view>
 			<view class="withdrawal-btn-wrap" v-if="bankList.length == 0 && progressCount > 0">
-				<text>点击查看提现进度</text>
+				<text>点击查看审核进度</text>
 			</view>
 		</view>
 

pages/withdrawal/progress.vue

@@ -52,12 +52,14 @@
 							<view style="margin-bottom: 10rpx;">
 								审批人：{{item.adminInfo.real_name?item.adminInfo.real_name:item.adminInfo.account?item.adminInfo.account:''}}
 							</view>
-							<view class="audit-info-txt" v-if="item.is_check == 2">审核不通过：{{item.fail_msg}}</view>
+							<view class="audit-info-txt" v-if="item.is_check == 2">
-							<view style="text-align: right;color:#46B03A;font-weight: bold;" v-if="item.is_check == 2"
+								审核不通过：{{item.fail_msg}}
-								@click="handleToUpdate(item)">
-								去修改
 							</view>
 						</view>
+						<view style="text-align: right;color:#46B03A;font-weight: bold;font-size: 26rpx;"
+							v-if="item.is_check == 2" @click="handleToUpdate(item)">
+							去修改
+						</view>
 					</view>
 				</view>
 			</view>
@@ -181,7 +183,7 @@
 			}
 
 			.shop-type-con-progress-right {
-				flex: 1;
+				width: 88%;
 				margin-bottom: 40rpx;
 
 				&:nth-last-child(1) {
@@ -223,6 +225,10 @@
 			.audit-info {
 				font-size: 22rpx;
 				color: #666666;
+
+				.audit-info-txt {
+					word-break: break-all;
+				}
 			}
 		}
 	}