1.打包h5 测试样式

App.vue

@@ -9,7 +9,7 @@
 			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
 			// imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
 			//测试
-			url: 'https://hsgcs.dctpay.com/crest',
+			url: 'https://paycs.dctpay.com/crest',
 			brestUrl: 'https://hsgcs.dctpay.com/brest',
 			imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
 			userInfo: "",

manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "业务员端",
-    "appid" : "__UNI__3003C40",
+    "name" : "炫支付",
+    "appid" : "__UNI__190622D",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -68,5 +68,11 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "h5" : {
+        "router" : {
+            "base" : "/cweb/"
+        },
+        "title" : "炫支付"
+    }
 }

pages.json

@@ -3,8 +3,13 @@
 		{
 			"path": "pages/login/login",
 			"style": {
+				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "登录",
-				"enablePullDownRefresh": false
+				"onReachBottomDistance": 50,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
 			}
 
 		}, {
@@ -12,17 +17,10 @@
 			"style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "首页",
-				"navigationBarBackgroundColor": "#3346b9",
-				"backgroundColorTop": "#3346b9",
 				"onReachBottomDistance": 50,
 				"app-plus": {
 					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none",
-					"subNVues": [{
-						"id": "homeTitleNvue", // 唯一标识  
-						"path": "pages/tabBar/home/subNvue/homeTitleNvue", // 页面路径  
-						"type": "navigationBar"
-					}]
+					"softinputNavBar": "none"
 				}
 			}
 		}, {
@@ -34,53 +32,47 @@
 			"path": "pages/tabBar/user/user",
 			"style": {
 				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "我的",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
+				"navigationBarTitleText": "个人中心",
 				"onReachBottomDistance": 50,
 				"app-plus": {
 					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none",
-					"subNVues": [{
-						"id": "homeTitleNvue", // 唯一标识  
-						"path": "pages/tabBar/home/subNvue/homeTitleNvue", // 页面路径  
-						"type": "navigationBar"
-					}]
+					"softinputNavBar": "none"
 				}
 			}
 		}, {
 			"path": "pages/index/merchant-list/merchant-list",
 			"style": {
 				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "商户列表",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
+				"navigationBarTitleText": "门店管理",
 				"onReachBottomDistance": 50,
 				"app-plus": {
 					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none",
-					"subNVues": [{
-						"id": "homeTitleNvue", // 唯一标识  
-						"path": "pages/tabBar/home/subNvue/homeTitleNvue", // 页面路径  
-						"type": "navigationBar"
-					}]
+					"softinputNavBar": "none"
 				}
 			}
 
 		}, {
 			"path": "pages/index/merchant-details/merchant-details",
 			"style": {
+				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "商户详情",
-				"enablePullDownRefresh": false
+				"onReachBottomDistance": 50,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
 			}
 
 		}, {
 			"path": "pages/index/merchant-incoming-parts/merchant-incoming-parts",
 			"style": {
+				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "商户进件",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#FFFFFF",
-				"backgroundColorTop": "#FFFFFF"
+				"onReachBottomDistance": 50,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
 			}
 
 		}
@@ -88,33 +80,75 @@
 		, {
 			"path": "pages/index/message-center/message-center",
 			"style": {
+				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "消息中心",
-				"enablePullDownRefresh": false
+				"onReachBottomDistance": 50,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
 			}
 
 		}, {
 			"path": "pages/index/business-category/business-category",
 			"style": {
+				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "经营品类",
-				"enablePullDownRefresh": false
+				"onReachBottomDistance": 50,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
 			}
 
 		}, {
 			"path": "pages/index/merchant-management/merchant-management",
 			"style": {
+				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "商户管理",
-				"enablePullDownRefresh": false
+				"onReachBottomDistance": 50,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
 			}
 
 		}, {
 			"path": "pages/index/store-details/store-details",
 			"style": {
+				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "门店信息",
-				"enablePullDownRefresh": false
+				"onReachBottomDistance": 50,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
+			}
+		}, {
+			"path": "pages/index/addStore/addStore",
+			"style": {
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "添加门店",
+				"onReachBottomDistance": 50,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
 			}
 
-		}
+		}, {
+			"path": "pages/index/collection-record/collection-record",
+			"style": {
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "收费记录",
+				"onReachBottomDistance": 50,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
+			}
 
+		}
 	],
 	"subpackages": [{
 		"root": "subPages",

pages/index/addStore/addStore.vue

@@ -0,0 +1,105 @@
+<template>
+	<view>
+		<view class="width100 mart10 backcorfff">
+			<view class="storename">
+				<view class="namecont">门店账号</view>
+				<input placeholder="请输入门店账号" v-model="storeaccount" style="width: 70%;"
+					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+			</view>
+			<view class="storename">
+				<view class="namecont">门店密码</view>
+				<input placeholder="请输入门店密码" v-model="storepasd" style="width: 70%;"
+					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+			</view>
+			<view class="storename">
+				<view class="namecont">门店名称</view>
+				<input placeholder="请输入门店名称" v-model="storename" style="width: 70%;"
+					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+			</view>
+			<view class="storename">
+				<view class="namecont">门店电话</view>
+				<input placeholder="请输入门店电话" v-model="storephone" style="width: 70%;"
+					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+			</view>
+			<view class="notes font16" style="border-bottom: 0px;">
+				<view class="width70 aliitem fcor666">
+					门店照片
+				</view>
+			</view>
+			<view class="width94 displ mart5">
+				<image src="../../../static/img/store/store1.png" mode="widthFix" class="width45"
+					style="margin-left: 3%;"></image>
+				<image src="../../../static/img/store/store2.png" mode="widthFix" class="width45"
+					@click="perImage('../../../static/img/store/store2.png')" style="margin-left: 3%;"></image>
+			</view>
+
+			<view class="width94 displ mart5">
+				<image src="../../../static/img/store/store3.png" mode="widthFix" class="width45"
+					style="margin-left: 3%;"></image>
+				<image src="../../../static/img/store/store4.png" mode="widthFix" class="width45"
+					@click="perImage('../../../static/img/store/store4.png')" style="margin-left: 3%;"></image>
+			</view>
+
+			<view class="width94 displ mart5 marb15">
+				<image src="../../../static/img/store/store5.png" mode="widthFix" class="width45"
+					style="margin-left: 3%;"></image>
+				<image src="../../../static/img/store/store6.png" mode="widthFix" class="width45"
+					@click="perImage('../../../static/img/store/store6.png')" style="margin-left: 3%;"></image>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				storeaccount: '', //门店账号
+				storepasd: '', //门店密码
+				storename: '', //门店名称
+				storephone: '', //门店电话
+				storeimg1: '', //门店图片
+			}
+		},
+		methods: {
+			/**
+			 * @param {Object} item 放大图片
+			 */
+			perImage(item) {
+				uni.previewImage({
+					current: 0, //预览图片的下标
+					urls: [item] //预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.storename {
+		width: calc(100% - 40upx);
+		height: 100upx;
+		display: flex;
+		align-items: center;
+		background-color: rgba($color: #ffffff, $alpha: 0.1);
+		border-bottom: 1px solid #f6f6f6;
+		padding: 8upx 20upx;
+
+		.namecont {
+			color: #666666;
+			width: 25%;
+		}
+	}
+
+	.notes {
+		width: calc(100% - 90upx);
+		display: flex;
+		align-items: center;
+		background-color: rgba($color: #ffffff, $alpha: 0.1);
+		border-bottom: 1px solid #f6f6f6;
+		padding: 20rpx 45rpx;
+		color: #bfbfbf;
+
+	}
+</style>

pages/index/collection-record/collection-record.vue

@@ -0,0 +1,43 @@
+<template>
+	<view>
+		<view class="mart15 width100">
+			<view class="width94 backcorfff border-r mart15" v-for="(item,index) in collectionlist" :key="index">
+				<view class="conts">¥<text class="font24 fcor089 fontwig6">299.99</text></view>
+				<view class="conts">2020-01-12 12:12:12</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				collectionlist:[1,2,3,4,5,6]
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f6f6f6;
+	}
+
+	.notes {
+		width: calc(100% - 40upx);
+		display: flex;
+		align-items: center;
+		padding: 20upx 0 20upx 20upx;
+	}
+	
+	.conts {
+		width: calc(100% - 60rpx);
+		display: flex;
+		align-items: center;
+		padding: 10rpx 30rpx 10rpx 30rpx;
+	}
+</style>

pages/index/merchant-details/merchant-details.vue

@@ -10,37 +10,37 @@
 		<!-- 商户信息 -->
 		<view class="mart15 width100 backcorfff" v-if="current == 0">
 			<view class="notes">
-				<view class="namecont width25">账号</view>
+				<view class="fcor666 width25">账号</view>
 				<view class="font14 fcor333 text2 width75 fotrt">15583658692</view>
 			</view>
 			<view class="notes">
-				<view class="namecont width25">商户ID</view>
+				<view class="fcor666 width25">商户ID</view>
 				<view class="font14 fcor333 text2 width75 fotrt">3132131</view>
 			</view>
 			<view class="notes">
-				<view class="namecont width25">联系人</view>
+				<view class="fcor666 width25">联系人</view>
 				<view class="font14 fcor333 text2 width75 fotrt">-</view>
 			</view>
 			<view class="notes">
-				<view class="namecont width25">手机号</view>
+				<view class="fcor666 width25">手机号</view>
 				<view class="font14 fcor333 text2 width75 fotrt">423423424242</view>
 			</view>
 			<view class="notes">
-				<view class="namecont width25">身份证号</view>
+				<view class="fcor666 width25">身份证号</view>
 				<view class="font14 fcor333 text2 width75 fotrt">423423434343424242</view>
 			</view>
 			<view class="notes">
-				<view class="namecont width25">银行卡号</view>
+				<view class="fcor666 width25">银行卡号</view>
 				<view class="font14 fcor333 text2 width75 fotrt">4324342423423424242</view>
 			</view>
 			<view class="notes">
-				<view class="namecont width25">所属银行</view>
+				<view class="fcor666 width25">所属银行</view>
 				<view class="font14 fcor333 text2 width75 fotrt">什么什么支行</view>
 			</view>
 		</view>
 		<!-- 门店信息 -->
 		<view class="mart15 width100" v-else>
-			<view class="width94 backcorfff border-r mart15" v-for="(item,index) in storeList" @click="jumpstoredes">
+			<view class="width94 backcorfff border-r mart15" v-for="(item,index) in storeList" :key="index" @click="jumpstoredes">
 				<view class="notes" style="border-bottom: 0px;">
 					<image src="../../../static/img/store/store7.png" mode="widthFix" class="iconw40"></image>
 					<view class="width65 margle">
@@ -58,7 +58,7 @@
 				</view>
 				<view class="conts" style="border-bottom: 0px;">
 					<image src="../../../static/img/store/store10.png" mode="widthFix" class="iconw"></image>
-					<view class="margle10 font14 fcor999">方式方式的方式的房东说发地方身份史蒂夫是房东说身份是发</view>
+					<view class="margle10 font14 fcor999 width90p">方式方式的方式的房东说发地方身份史蒂夫是房东说身份是发</view>
 				</view>
 			</view>
 		</view>

pages/index/merchant-incoming-parts/merchant-incoming-parts.vue

@@ -291,7 +291,7 @@
 			<view class="username">
 				<view class="namecont">结算类型</view>
 				<input placeholder="请选择结算类型" v-model="lementType" style="width: 70%;" disabled="true"
-					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" @click="showletPopup()" />
+					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" @click="showPopup()" />
 				<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
 			</view>
 			<!-- 非法人结算 -->
@@ -527,72 +527,73 @@
 		</view>
 
 
-		<!-- 商户类型选择 -->
 		<wybPopup ref="popup" type="bottom" width="500" bgColor="#f6f6f6" radius="6" :showCloseIcon="true">
-			<view class="fotct font18 fontwig6 fcor333 mart10 height30">选择商户类型</view>
-			<view class="width92 mart20" @click="changeMerchant(1)">
-				<view class="wybtc">
-					<image src="../../../static/img/wyb1.png" mode="widthFix" class="iconw40"></image>
-					<view class="width70 margle10">
-						<view class="fcor333 font16">个体商户</view>
-						<view class="fcor999 font14">需要提供营业执照和法人身份证照片和结算银行卡等</view>
+			<!-- 商户类型选择 -->
+			<view class="width100" v-if="merchart == 1">
+				<view class="fotct font18 fontwig6 fcor333 mart10 height30">选择商户类型</view>
+				<view class="width92 mart20" @click="changeMerchant(1)">
+					<view class="wybtc">
+						<image src="../../../static/img/wyb1.png" mode="widthFix" class="iconw40"></image>
+						<view class="width70 margle10">
+							<view class="fcor333 font16">个体商户</view>
+							<view class="fcor999 font14">需要提供营业执照和法人身份证照片和结算银行卡等</view>
+						</view>
+						<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw margle20"></image>
 					</view>
-					<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw margle20"></image>
 				</view>
-			</view>
-			<view class="width92 mart15" @click="changeMerchant(2)">
-				<view class="wybtc">
-					<image src="../../../static/img/wyb2.png" mode="widthFix" class="iconw40"></image>
-					<view class="width70 margle10">
-						<view class="fcor333 font16">企业商户</view>
-						<view class="fcor999 font14">一般为有限公司,需要提供营业执照及法人身份证照片等</view>
+				<view class="width92 mart15" @click="changeMerchant(2)">
+					<view class="wybtc">
+						<image src="../../../static/img/wyb2.png" mode="widthFix" class="iconw40"></image>
+						<view class="width70 margle10">
+							<view class="fcor333 font16">企业商户</view>
+							<view class="fcor999 font14">一般为有限公司,需要提供营业执照及法人身份证照片等</view>
+						</view>
+						<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw margle20"></image>
 					</view>
-					<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw margle20"></image>
 				</view>
-			</view>
-			<view class="width92 mart15" @click="changeMerchant(3)">
-				<view class="wybtc">
-					<image src="../../../static/img/wyb3.png" mode="widthFix" class="iconw40"></image>
-					<view class="width70 margle10">
-						<view class="fcor333 font16">小微商户</view>
-						<view class="fcor999 font14">无营业执照的商户</view>
+				<view class="width92 mart15" @click="changeMerchant(3)">
+					<view class="wybtc">
+						<image src="../../../static/img/wyb3.png" mode="widthFix" class="iconw40"></image>
+						<view class="width70 margle10">
+							<view class="fcor333 font16">小微商户</view>
+							<view class="fcor999 font14">无营业执照的商户</view>
+						</view>
+						<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw margle20"></image>
 					</view>
-					<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw margle20"></image>
 				</view>
 			</view>
-		</wybPopup>
-		<!-- 结算类型 -->
-		<wybPopup ref="letpopup" type="bottom" width="500" bgColor="#f6f6f6" radius="6" :showCloseIcon="true">
-			<view class="fotct font18 fontwig6 fcor333 mart10 height30">选择商户类型</view>
-			<view class="width92 mart20" @click="changelementtype(1)">
-				<view class="wybtc" style="height: 40px;">
-					<image src="../../../static/img/wyb4.png" mode="widthFix" class="iconw40"></image>
-					<view class="width70 margle10">
-						<view class="fcor333 font16">对私非法人结算</view>
+			<!-- 结算类型 -->
+			<view class="width100" v-if="merchart == 2">
+				<view class="fotct font18 fontwig6 fcor333 mart10 height30">选择商户类型</view>
+				<view class="width92 mart20" @click="changelementtype(1)">
+					<view class="wybtc" style="height: 40px;">
+						<image src="../../../static/img/wyb4.png" mode="widthFix" class="iconw40"></image>
+						<view class="width70 margle10">
+							<view class="fcor333 font16">对私非法人结算</view>
+						</view>
+						<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw margle20"></image>
 					</view>
-					<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw margle20"></image>
 				</view>
-			</view>
-			<view class="width92 mart20" @click="changelementtype(2)">
-				<view class="wybtc" style="height: 40px;">
-					<image src="../../../static/img/wyb4.png" mode="widthFix" class="iconw40"></image>
-					<view class="width70 margle10">
-						<view class="fcor333 font16">对私法人结算</view>
+				<view class="width92 mart20" @click="changelementtype(2)">
+					<view class="wybtc" style="height: 40px;">
+						<image src="../../../static/img/wyb4.png" mode="widthFix" class="iconw40"></image>
+						<view class="width70 margle10">
+							<view class="fcor333 font16">对私法人结算</view>
+						</view>
+						<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw margle20"></image>
 					</view>
-					<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw margle20"></image>
 				</view>
-			</view>
-			<view class="width92 mart20" @click="changelementtype(3)">
-				<view class="wybtc" style="height: 40px;">
-					<image src="../../../static/img/wyb4.png" mode="widthFix" class="iconw40"></image>
-					<view class="width70 margle10">
-						<view class="fcor333 font16">对公结算</view>
+				<view class="width92 mart20" @click="changelementtype(3)">
+					<view class="wybtc" style="height: 40px;">
+						<image src="../../../static/img/wyb4.png" mode="widthFix" class="iconw40"></image>
+						<view class="width70 margle10">
+							<view class="fcor333 font16">对公结算</view>
+						</view>
+						<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw margle20"></image>
 					</view>
-					<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw margle20"></image>
 				</view>
 			</view>
 		</wybPopup>
-
 		<!-- 下一步,审核 -->
 		<view class="btn" @tap="gonextstep" v-if="merchart != 3">下一步</view>
 		<view class="btn" @tap="gonextstep" v-else>提交审核</view>
@@ -617,7 +618,7 @@
 				format: true
 			})
 			return {
-				merchart: 2, //当前第几步操作
+				merchart: 0, //当前第几步操作
 				mercontacts: '', //商户联系人
 				phoneNumber: '', //商户手机号
 				loginphone: '', //商户登录账号
@@ -703,10 +704,6 @@
 					url: '../business-category/business-category'
 				})
 			},
-			//显示结算类型
-			showletPopup() {
-				this.$refs.letpopup.show();
-			},
 			//选择商户
 			changeMerchant(item) {
 				if (item == 1) {
@@ -737,7 +734,7 @@
 					this.lementId = 3;
 					this.lementType = '对公结算';
 				}
-				this.$refs.letpopup.hide();
+				this.$refs.popup.hide();
 			},
 			// 获取当前时间
 			getDate(type) {
@@ -770,24 +767,31 @@
 					});
 					return;
 				}
-				uni.showLoading({
-					title: '发送中...'
-				})
-				let params = {
-					phone: this.phoneNumber
-				}
-				sendSmsCode(params).then(res => {
-					uni.hideLoading();
-					if (res.return_code == '000000') {
-						this.getCodeisWaiting = true;
-						this.getCodeBtnColor = "#bfbfbf"
-						uni.showToast({
-							title: '验证码已发送',
-							icon: "none"
-						});
-						this.setTimer();
-					}
-				})
+				// uni.showLoading({
+				// 	title: '发送中...'
+				// })
+				this.getCodeisWaiting = true;
+				this.getCodeBtnColor = "#bfbfbf"
+				uni.showToast({
+					title: '验证码已发送',
+					icon: "none"
+				});
+				this.setTimer();
+				// let params = {
+				// 	phone: this.phoneNumber
+				// }
+				// sendSmsCode(params).then(res => {
+				// 	uni.hideLoading();
+				// 	if (res.return_code == '000000') {
+				// 		this.getCodeisWaiting = true;
+				// 		this.getCodeBtnColor = "#bfbfbf"
+				// 		uni.showToast({
+				// 			title: '验证码已发送',
+				// 			icon: "none"
+				// 		});
+				// 		this.setTimer();
+				// 	}
+				// })
 			},
 			/**
 			 * 倒计时
@@ -944,7 +948,7 @@
 			right: 7px;
 			z-index: 3;
 			border: 1px solid #bfbfbf;
-			width: 20%;
+			width: 25%;
 			padding: 3px 5px;
 			border-radius: 22px;
 

pages/index/merchant-list/merchant-list.vue

@@ -1,31 +1,72 @@
 <template>
 	<view>
-		<view class="height120 width94 backcorfff mart10 border-r" @click="jumpmerdetails" v-for="(item,index) in merlist">
-			<image class="merleft flleft mart10 margle10" src="../../../static/logo.png"></image>
-			<view class="merright">
-				<view class="merbtnrig">优选商家</view>
-				<view class="font16 fcor333 text2 width100 paddtop5">重庆观音桥步行街124号附3单元</view>
-				<view class="font14 fcor666 text1 paddtop10">进件时间: 2021-12-10-17:52:12</view>
+		<!-- //分类 -->
+		<view class="backcorfff width100">
+			<QSTabs ref="tabs" :tabs="tabs" animationMode="line2" :current="current" @change="change"
+				activeColor="#089bf5" lineColor="#089bf5" swiperWidth="750">
+			</QSTabs>
+		</view>
+		<!-- 多状态内容 -->
+		<view class="mart15 width100">
+			<view class="width94 backcorfff border-r mart15" v-for="(item,index) in merlist" :key="index"
+				@click="jumpstoredes">
+				<view class="notes" style="border-bottom: 0px;">
+					<image src="../../../static/img/store/store7.png" mode="widthFix" class="iconw40"></image>
+					<view class="width65 margle">
+						<view class="font14 fcor333">155832658692</view>
+						<view class="font12 fcor999">2021-12-15 09:30:21</view>
+					</view>
+					<view class="otstatucs font14">审核失败</view>
+				</view>
+				<view class="conts" style="border-bottom: 0px;">
+					<image src="../../../static/img/store/store8.png" mode="widthFix" class="iconw"></image>
+					<view class="margle10 font14 fcor999">155242424242</view>
+				</view>
+				<view class="conts" style="border-bottom: 0px;">
+					<image src="../../../static/img/store/store9.png" mode="widthFix" class="iconw"></image>
+					<view class="margle10 font14 fcor999">155242424242</view>
+				</view>
+				<view class="conts" style="border-bottom: 0px;">
+					<image src="../../../static/img/store/store10.png" mode="widthFix" class="iconw"></image>
+					<view class="margle10 font14 fcor999 width90p">方式方式的方式的房东说发地方身份史蒂夫是房东说身份是发</view>
+				</view>
 			</view>
 		</view>
+		<view class="width100 height60"></view>
 	</view>
 </template>
 
 <script>
+	import QSTabs from '../../../components/QS-tabs/QS-tabs.vue';
 	export default {
+		components: {
+			QSTabs
+		},
 		data() {
 			return {
-				merlist:[1,2,3,4,5]
+				merlist: [1, 2, 3, 4, 5, 6],
+				tabs: ["待审核", "驳回", "通过"],
+				current: 0, // tabs默认值
 			}
 		},
+		onLoad() {},
 		methods: {
-			/**
-			 * 跳转商户详情
-			 */
-			jumpmerdetails(){
-				uni.navigateTo({
-					url:'../merchant-details/merchant-details'
-				})
+			//筛选
+			change(index) {
+				this.$refs.tabs.setFinishCurrent(index);
+				this.current = index;
+			},
+			//跳转门店详情
+			jumpstoredes() {
+				if (this.current == 0) {
+					uni.navigateTo({
+						url: '../addStore/addStore'
+					})
+					return;
+				}
+				uni.navigateTo({
+					url: '../store-details/store-details'
+				})
 			}
 		}
 	}
@@ -33,26 +74,36 @@
 
 <style lang="scss">
 	page {
-		background-color: #F5F5F5;
+		background-color: #f6f6f6;
 	}
 
-	.merleft {
-		width: 100px;
-		max-height: 100px;
+	.notes {
+		width: calc(100% - 40upx);
+		display: flex;
+		align-items: center;
+		padding: 20upx 0 20upx 20upx;
 	}
 
-	.merright {
-		margin-left: 115px;
-		.merbtnrig{
-			height: 30px;
-			text-align: center;
-			line-height: 30px;
-			width: 80px;
-			border-radius: 0 5px 0 15px;
-			background: linear-gradient(to right, #ec775c, #f19b71);
-			color: #FFFFFF;
-			font-size: 14px;
-			float: right;
-		}
+	.conts {
+		width: calc(100% - 60rpx);
+		display: flex;
+		align-items: center;
+		padding: 0 30rpx 10rpx 30rpx;
+	}
+
+	//正常状态
+	.statucs {
+		background-color: #e9f9e5;
+		color: #84b878;
+		text-align: center;
+		padding: 2px 5px;
+	}
+
+	//其他状态
+	.otstatucs {
+		background-color: #fbeee4;
+		color: #db8c73;
+		text-align: center;
+		padding: 2px 5px;
 	}
 </style>

pages/index/merchant-management/merchant-management.vue

@@ -7,7 +7,7 @@
 		</view>
 		<!-- 状态 -->
 		<view class="mart20 width100">
-			<view class="width94 backcorfff border-r mart15" v-for="(item,index) in merchantlist" @click="jumpmerdes">
+			<view class="width94 backcorfff border-r mart15" v-for="(item,index) in merchantlist" :key="index" @click="jumpmerdes">
 				<view class="notes">
 					<image src="../../../static/img/merchantstu.png" mode="widthFix" class="iconw40"></image>
 					<view class="width65 margle">

pages/index/message-center/message-center.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="width100 height80 backcorfff" v-for="(item,index) in messList">
+		<view class="width100 height80 backcorfff" v-for="(item,index) in messList" :key="index">
 			<view class="width94 bor-botm1">
 				<view class="width80p flleft font14">
 					<view class="width100 fcor333 text2 paddtop10">

pages/tabBar/home/home.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<image mode="widthFix" class="width100 headimg" src="../../../static/img/head.png"></image>
-		<view class="headcont fotct">
+		<view class="headcont fotct" @click="jumpdesfun('../../tabBar/user/user')">
 			<view class="width94 fcorfff font18 alijus">谷润科技<image mode="widthFix" class="margle iconw"
 					src="../../../static/img/jt.png"></image>
 			</view>
@@ -43,7 +43,7 @@
 		</view>
 		<!-- 菜单功能 -->
 		<view class="width100 line10"></view>
-		<view class="funcss" v-for="(item,index) in funcList" @click="jumpdesfun(item.url)">
+		<view class="funcss" v-for="(item,index) in funcList" :key="index" @click="jumpdesfun(item.url)">
 			<image src="../../../static/img/mer6.png" mode="widthFix" class="funicon"></image>
 			<view class="width100 font13">{{item.title}}</view>
 		</view>
@@ -66,10 +66,19 @@
 						url: '../../index/merchant-management/merchant-management',
 						img: ''
 					},
-					{
-						title: '我的',
-						url: '../../tabBar/user/user',
-						img: ''
+					{
+						title: '新增门店',
+						url: '../../index/addStore/addStore',
+						img: ''
+					},
+					{
+						title: '门店管理',
+						url: '../../index/merchant-list/merchant-list',
+						img: ''
+					},{
+						title: '收费记录',
+						url: '../../index/collection-record/collection-record',
+						img: ''
 					},
 				]
 			};

pages/tabBar/user/user.vue

@@ -4,7 +4,13 @@
 			<view class="width94 fcor333 font16 paddtop10">谷润科技</view>
 			<view class="width94 fcor999 font14 paddtop10">1551243232</view>
 			<view class="width94 fcor999 font14  paddtop10">名称｜超级管理员</view>
-		</view>
+		</view>
+		<view class="width100 backcorfff mart15">
+			<view class="notes">
+				<view class="fcor666 width90p">结算银行账户</view>
+				<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
+			</view>
+		</view>
 		<wButton class="mart60" text="退 出 登 录" bgColor="#089bf5" :rotate="isRotate" @click="exitLogin"></wButton>
 	</view>
 </template>
@@ -39,6 +45,13 @@
 </script>
 <style lang="scss">
 	page {
-		background-color: #f9f9f9;
+		background-color: #f6f6f6;
+	}
+	.notes {
+		width: calc(100% - 40rpx);
+		display: flex;
+		align-items: center;
+		padding: 30rpx 0 30rpx 20rpx;
+		border-bottom: 1px solid #f6f6f6;
 	}
 </style>

unpackage/dist/build/h5/index.html

@@ -0,0 +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=/cweb/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.0004de39.js></script><script src=/cweb/static/js/index.96f180c6.js></script></body></html>