解决冲突

App.vue

@@ -16,9 +16,6 @@
 	@import "/style/css/layout.css";
 	@import "style/css/main.css";
 	@import "style/css/flex-main.css";
-	/* @import "/style/iconfont.css"; */
-/* 	@import "vant/lib/index.less";
-	@import url("./static/font/iconfont.css"); */
 
 	/deep/.uni-select {
 		background-color: #fff;

components/drag_demo/Inform.vue

@@ -69,7 +69,7 @@ export default {
 };
 </script>
 
-<style>
+<style lang="less" scoped>
 .info {
 	text-indent: 2em;
 	font-size: 28upx;

components/head-info/head-info.vue

@@ -1,18 +1,130 @@
 <template>
 	<view class="headInfo">
-		<view class="info">
+		<view class="info" @click="showInfo">
 			<image class="toux" src="@/static/images/theme/toux.png" mode="widthFix"></image>
 			<text>wchenp</text>
 			<uni-icons type="gear" size="21" />
 		</view>
-
+		<view class="infoList" v-if="infoType">
+			<view class="userInfo">
+				<p>张星星 - 堆场计划员</p>
+				<p>12341234567</p>
+			</view>
+			<view class="borTop" @click="tabsPort('center')">
+				<uni-icons type="loop" size="16" />
+				<text>切换港口</text>
+			</view>
+			<view class="borTop" @click="outLogin">
+				<uni-icons type="undo" size="16" />
+				<text>退出登录</text>
+			</view>
+		</view>
+		<uni-popup ref="popup" background-color="#fff" @change="change">
+			<view class="popupBox">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in portList" :key="index"
+						:class="{active:activeIndex == index}" @click="selectPort(item,index)">
+						<text>{{item.title}}</text>
+					</view>
+				</view>
+				<view class="btnBox">
+					<button class="btn" type="default" @click="close">取 消</button>
+					<button class="btn" type="primary" @click="toGo">确 定</button>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="popup2" type="dialog">
+			<uni-popup-dialog confirmText="确定" content="是否退出登录？" @close="close2"
+				@confirm="outConfirm"></uni-popup-dialog>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
+	export default {
+		data() {
+			return {
+				infoType: false,
+				// 弹框状态
+				type: "",
+				portList: [{
+						value: "1",
+						title: "港口1"
+					},
+					{
+						value: "2",
+						title: "港口2"
+					},
+					{
+						value: "3",
+						title: "港口3"
+					},
+				],
+				portId: "",
+				portName: "",
+				activeIndex: 0,
+			}
+		},
+		mounted() {
+			this.activeIndex = uni.getStorageSync("selectPortIndex")
+			this.portId = this.portList[this.activeIndex].value
+			this.portName = this.portList[this.activeIndex].title
+		},
+		methods: {
+			showInfo() {
+				this.infoType = !this.infoType
+			},
+			// 点击切换港口
+			tabsPort(type) {
+				this.type = type
+				this.$refs.popup.open(type)
+			},
+			// 弹框
+			change(e) {},
+			// 选择弹框内容
+			selectPort(item, index) {
+				this.portName = item.title
+				this.portId = item.value
+				this.activeIndex = index
+			},
+			// 确认弹框
+			toGo() {
+				let portObj = {
+					portName: this.portName,
+					portId: this.portId
+				}
+				uni.setStorageSync('portObj', portObj);
+				uni.setStorageSync('selectPortIndex', this.activeIndex)
+				this.$refs.popup.close()
+				this.infoType = false
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			},
+			// 关闭弹框
+			close() {
+				this.infoType = false
+				this.$refs.popup.close()
+			},
+			// 点击退出登录
+			outLogin() {
+				this.$refs.popup2.open()
+			},
+			// 确认退出登录
+			outConfirm() {
+				uni.navigateTo({
+					url: '/pages/login/index'
+				})
+			},
+			// 取消退出登录
+			close2() {
+				this.infoType = false
+			}
+		}
+	}
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 	.headInfo {
 		width: 100%;
 		height: 40px;
@@ -21,6 +133,7 @@
 		border-bottom: 1px solid #999999;
 		display: flex;
 		justify-content: flex-end;
+		position: relative;
 
 		.info {
 			width: 120px;
@@ -33,11 +146,73 @@
 				height: 26px;
 				border-radius: 30px;
 				overflow: hidden;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+			}
+		}
+
+		.infoList {
+			width: 200px;
+			height: 190px;
+			padding: 10px 20px;
+			border-radius: 8px;
+			background-color: #fff;
+			z-index: 999;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			position: absolute;
+			right: 0;
+			top: 40px;
+
+			.borTop {
+				border-top: 1px #ccc solid;
+
+				/deep/.uni-icons {
+					margin-right: 10px;
+				}
+			}
+		}
+
+		.popupBox {
+			width: 500px;
+			height: 400px;
+			overflow: scroll;
+			padding: 30px;
+
+			.ul {
+				display: felx;
+				flex-direction: column;
+				justify-content: space-between;
+
+				.li {
+					padding: 15px 0px;
+					border: 1px solid #ccc;
+					border-radius: 4px;
+					margin-bottom: 10px;
+				}
+
+				.active {
+					color: #0079fe;
+					border-color: #0079fe;
+				}
 			}
 
-			text {
+			.btnBox {
-				display: in;
+				display: flex;
+				justify-content: space-between;
+
+				.btn {
+					flex: 1;
+					padding: 10px 0;
+					margin: 10px 20px;
+				}
 			}
 		}
+
+		/deep/.uni-dialog-title {
+			display: none;
+		}
 	}
 </style>

components/head-view/head-view.vue

@@ -23,7 +23,7 @@
 	}
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 	.headInfo {
 		position: relative;
 		background-color: #fff;

main.js

@@ -22,28 +22,6 @@ import liuStepBar from './uni_modules/liu-step-bar/components/liu-step-bar/liu-s
 Vue.component('uni-pop', uniPop)
 Vue.component('liu-step-bar', liuStepBar)
 
-// import Vant from 'vant';
-// import 'vant/lib/index.less';
-// Vue.use(Vant);
-// import {
-// 	RadioGroup,
-// 	Radio,
-// 	Button,
-// 	Uploader,
-// 	Field,
-// 	Checkbox,
-// 	CheckboxGroup,
-// 	Progress
-// } from 'vant';
-
-// Vue.use(Radio);
-// Vue.use(RadioGroup);
-// Vue.use(Button);
-// Vue.use(Uploader);
-// Vue.use(Field);
-// Vue.use(Checkbox);
-// Vue.use(CheckboxGroup);
-
 
 const app = new Vue({
 	store,

manifest.json

@@ -1,88 +1,87 @@
 {
-	"name": "iapd",
+    "name" : "iapd",
-	"appid": "__UNI__820CEDC",
+    "appid" : "__UNI__820CEDC",
-	"description": "",
+    "description" : "",
-	"versionName": "1.0.0",
+    "versionName" : "1.0.0",
-	"versionCode": "100",
+    "versionCode" : "100",
-	"transformPx": false,
+    "transformPx" : false,
-	/* 5+App特有相关 */
+    /* 5+App特有相关 */
-	"app-plus": {
+    "app-plus" : {
-		"usingComponents": true,
+        "usingComponents" : true,
-		"nvueStyleCompiler": "uni-app",
+        "nvueStyleCompiler" : "uni-app",
-		"compilerVersion": 3,
+        "compilerVersion" : 3,
-		"splashscreen": {
+        "splashscreen" : {
-			"alwaysShowBeforeRender": true,
+            "alwaysShowBeforeRender" : true,
-			"waiting": true,
+            "waiting" : true,
-			"autoclose": true,
+            "autoclose" : true,
-			"delay": 0
+            "delay" : 0
-		},
+        },
-		/* 模块配置 */
+        /* 模块配置 */
-		"modules": {},
+        "modules" : {},
-		/* 应用发布信息 */
+        /* 应用发布信息 */
-		"distribute": {
+        "distribute" : {
-			/* android打包配置 */
+            /* android打包配置 */
-			"android": {
+            "android" : {
-				"permissions": [
+                "permissions" : [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
+                ],
-			},
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
-			/* ios打包配置 */
+            },
-			"ios": {},
+            /* ios打包配置 */
-			/* SDK配置 */
+            "ios" : {},
-			"sdkConfigs": {}
+            /* SDK配置 */
-		}
+            "sdkConfigs" : {}
-	},
+        }
-	/* 快应用特有相关 */
+    },
-	"quickapp": {},
+    /* 快应用特有相关 */
-	/* 小程序特有相关 */
+    "quickapp" : {},
-	"mp-weixin": {
+    /* 小程序特有相关 */
-		"appid": "wxb5fe43c6c0f0a8da",
+    "mp-weixin" : {
-		"setting": {
+        "appid" : "wxb5fe43c6c0f0a8da",
-			"urlCheck": false,
+        "setting" : {
-			"es6": true,
+            "urlCheck" : false,
-			"ignoreDevUnusedFiles": false
+            "es6" : true,
-		},
+            "ignoreDevUnusedFiles" : false
-		"usingComponents": true,
+        },
-		"permission": {
+        "usingComponents" : true,
-			"scope.userLocation": {
+        "permission" : {
-				"desc": "获取当前定位判断距离"
+            "scope.userLocation" : {
-			}
+                "desc" : "获取当前定位判断距离"
-		},
+            }
-		"requiredPrivateInfos": [
+        },
-			"getLocation"
+        "requiredPrivateInfos" : [ "getLocation" ],
-		],
+        "plugins" : {
-		"plugins": {
+            "ocr-plugin" : {
-			"ocr-plugin": {
+                "version" : "3.1.1",
-				"version": "3.1.1",
+                "provider" : "wx4418e3e031e551be"
-				"provider": "wx4418e3e031e551be"
+            }
-			}
+        }
-		}
+    },
-	},
+    "mp-alipay" : {
-	"mp-alipay": {
+        "usingComponents" : true
-		"usingComponents": true
+    },
-	},
+    "mp-baidu" : {
-	"mp-baidu": {
+        "usingComponents" : true
-		"usingComponents": true
+    },
-	},
+    "mp-toutiao" : {
-	"mp-toutiao": {
+        "usingComponents" : true
-		"usingComponents": true
+    },
-	},
+    "uniStatistics" : {
-	"uniStatistics": {
+        "enable" : false
-		"enable": false
+    },
-	},
+    "vueVersion" : "2"
-	"vueVersion": "2"
 }

pages.json

@@ -1,5 +1,11 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/login/index",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		},
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -9,7 +15,10 @@
 		{
 			"path": "pages/index/instruct",
 			"style": {
-				"navigationBarTitleText": "指令"
+				"navigationBarTitleText": "指令",
+				"usingComponents": {
+					"van-progress": "/wxcomponents/vant/dist/progress/index"
+				}
 			}	
 		},
 		{
@@ -36,6 +45,12 @@
 				"navigationBarTitleText": "单证列表"
 			}
 		},
+		{
+			"path": "pages/shipWork/sign",
+			"style": {
+				"navigationBarTitleText": "单证签名"
+			}
+		},
 		{
 			"path": "pages/shipWork/mixWork",
 			"style": {
@@ -45,18 +60,18 @@
 		{
 			"path": "pages/shipWork/peopleAdd",
 			"style": {
-				"navigationBarTitleText": "杂项作业查看(人员信息)"
+				"navigationBarTitleText": "杂项作业(人员信息)"
 			}
 		},
 		{
 			"path": "pages/shipWork/shiftAdd",
 			"style": {
-				"navigationBarTitleText": "杂项作业查看(工班信息)"
+				"navigationBarTitleText": "杂项作业(工班信息)"
 			}
 		}, {
 			"path": "pages/shipWork/shiftDetails",
 			"style": {
-				"navigationBarTitleText": "工班信息详情"
+				"navigationBarTitleText": "杂项作业(工班信息)"
 			}
 		}, {
 			"path": "pages/shipWork/untieCord",
@@ -159,7 +174,7 @@
 			"style": {
 				"navigationBarTitleText": "品牌明细"
 			}
-		},{
+		}, {
 			"path": "pages/shipWork/carDetails",
 			"style": {
 				"navigationBarTitleText": "车型明细"

pages/discharge/index.vue

@@ -31,7 +31,7 @@
 	};
 </script>
 
-<style>
+<style lang="less" scoped>
 	.container {
 		display: flex;
 	}

pages/login/index.vue

@@ -0,0 +1,172 @@
+<template>
+	<view class="login">
+		<view class="loginBox">
+			<uni-easyinput prefixIcon="person-filled" v-model="account" placeholder="请输入账号"></uni-easyinput>
+			<uni-easyinput type="password" prefixIcon="locked-filled" suffixIcon="search" v-model="account"
+				placeholder="请输入密码">
+			</uni-easyinput>
+			<view class="button" @click="loginGo('center')">登录</view>
+			<uni-popup ref="popup" background-color="#fff" @change="change">
+				<view class="popupBox">
+					<view class="ul">
+						<view class="li" v-for="(item,index) in portList" :key="index"
+							:class="{active:activeIndex == index}" @click="selectPort(item,index)">
+							<text>{{item.title}}</text>
+						</view>
+					</view>
+					<view class="btnBox">
+						<button class="btn" type="default" @click="close">取 消</button>
+						<button class="btn" type="primary" @click="toGo">确 定</button>
+					</view>
+				</view>
+			</uni-popup>
+			<uni-popup ref="popup2" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="未开通权限，请联系管理员"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// rtoswuhan1
+				account: 'rtoswuhan1',
+				// 123456
+				password: '123456',
+				// 弹框状态
+				type: "",
+				portList: [],
+				portId: "",
+				portName: "",
+				activeIndex: 0,
+			}
+		},
+		mounted() {
+			this.portList = [{
+					value: "1",
+					title: "港口1"
+				},
+				{
+					value: "2",
+					title: "港口2"
+				},
+				{
+					value: "3",
+					title: "港口3"
+				},
+			]
+		},
+		methods: {
+			// 登录
+			loginGo(type) {
+				if (this.account == "rtoswuhan1" && this.password == "123456") {
+					if (this.portList.length > 0) {
+						this.type = type
+						this.$refs.popup.open(type)
+						this.portId = this.portList[0].value
+						this.portName = this.portList[0].title
+					} else {
+						this.$refs.popup2.open()
+					}
+				}
+			},
+			// 弹框
+			change(e) {},
+			// 选择弹框内容
+			selectPort(item, index) {
+				this.portName = item.title
+				this.portId = item.value
+				this.activeIndex = index
+			},
+			// 确认弹框
+			toGo() {
+				let portObj = {
+					portName: this.portName,
+					portId: this.portId
+				}
+				uni.setStorageSync('portObj', portObj)
+				uni.setStorageSync('selectPortIndex', this.activeIndex)
+				this.$refs.popup.close()
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			},
+			// 关闭弹框
+			close() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.login {
+		height: calc(100vh - 44px);
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+
+		.loginBox {
+			width: 500px;
+			height: 300px;
+			border: 1px solid #999;
+			margin: 0 auto;
+			padding: 30px;
+
+			/deep/.is-input-border {
+				margin-top: 20px;
+			}
+
+			.popupBox {
+				width: 500px;
+				height: 400px;
+				overflow: scroll;
+				padding: 30px;
+				line-height: 40px;
+
+				.ul {
+					display: felx;
+					flex-direction: column;
+					justify-content: space-between;
+
+					.li {
+						padding: 15px 0px;
+						border: 1px solid #ccc;
+						border-radius: 4px;
+						margin-bottom: 10px;
+					}
+
+					.active {
+						color: #0079fe;
+						border-color: #0079fe;
+					}
+				}
+
+				.btnBox {
+					display: flex;
+					justify-content: space-between;
+
+					.btn {
+						flex: 1;
+						padding: 10px 0;
+						margin: 10px 20px;
+					}
+				}
+			}
+		}
+
+		.button {
+			color: #fff;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			letter-spacing: 4rpx;
+			border-radius: 12rpx;
+			height: 80rpx;
+			background-color: #0079fe;
+			margin-top: 50px;
+		}
+	}
+</style>

pages/shipWork/abnormal.vue

@@ -1,15 +1,21 @@
 <template>
 	<view class="abnormal">
 		<view class="container">
-			<view class="ul">
+			<view class="signBox">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+				<p class="sign" @click="sign">点击签名</p>
-					<view class="title">类型：{{item.type}}</view>
-					<p>上传状态：未上传</p>
-					<p>航次：{{item.vvyName}}</p>
-					<p>贸易类型：{{item.importExportFlagName}}</p>
-					<p>进出口：{{item.tradeTypeName}}</p>
-				</view>
 			</view>
+			<template v-if="infoList.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+						<view class="title">类型：{{item.type}}</view>
+						<p>上传状态：未上传</p>
+						<p>航次：{{item.vvyName}}</p>
+						<p>贸易类型：{{item.importExportFlagName}}</p>
+						<p>进出口：{{item.tradeTypeName}}</p>
+					</view>
+				</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -28,6 +34,13 @@
 			this.infoList = uni.getStorageSync('addAbnormalArr')
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('abnormalRow', item);
@@ -50,6 +63,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.ul {
 				padding: 20px 0;
 

pages/shipWork/abnormalAdd.vue

@@ -38,6 +38,10 @@
 					<text v-else>{{remark}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -127,8 +131,8 @@
 					url: '/pages/shipWork/abnormal'
 				})
 			},
-			// 删除
+			// 弹框删除
-			del() {
+			delConfirm() {
 				let addAbnormalArr = uni.getStorageSync('addAbnormalArr')
 				addAbnormalArr.splice(this.abnormalRowIndex, 1)
 				uni.setStorageSync('addAbnormalArr', addAbnormalArr);
@@ -136,6 +140,10 @@
 					url: '/pages/shipWork/abnormal'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addAbnormalArr = uni.getStorageSync('addAbnormalArr')

pages/shipWork/brandDetails.vue

@@ -10,22 +10,25 @@
 						:defaultValue="defaultValue" @result="resultConditon" />
 				</view>
 			</view>
-			<view class="ul">
+			<template v-if="listInfo.length > 0">
-				<view class="li" v-for="(item,index) in listInfo" :key="index" @click="togoCar(item)">
+				<view class="ul">
-					<p class="title">品牌：{{item.brdName}}</p>
+					<view class="li" v-for="(item,index) in listInfo" :key="index" @click="togoCar(item)">
-					<p>提单号：{{item.mnfBl}}</p>
+						<p class="title">品牌：{{item.brdName}}</p>
-					<p>源类型：{{item.sourceType}}</p>
+						<p>提单号：{{item.mnfBl}}</p>
-					<p>场位：{{item.yardPos}}</p>
+						<p>源类型：{{item.sourceType}}</p>
-					<p>航次：{{item.vvyName}}</p>
+						<p>场位：{{item.yardPos}}</p>
-					<p>报关状态：{{item.customsDeclareStatus}}</p>
+						<p>航次：{{item.vvyName}}</p>
-					<p>车型：{{item.bvmName}}</p>
+						<p>报关状态：{{item.customsDeclareStatus}}</p>
-					<p>数量：{{item.amount}}</p>
+						<p>车型：{{item.bvmName}}</p>
-					<p>港口：{{item.potName}}</p>
+						<p>数量：{{item.amount}}</p>
-					<p>报关单号：{{item.customsDeclareNo}}</p>
+						<p>港口：{{item.potName}}</p>
-					<p>车型明细：{{item.bvdName}}</p>
+						<p>报关单号：{{item.customsDeclareNo}}</p>
-					<p>货代：{{item.agentName}}</p>
+						<p>车型明细：{{item.bvdName}}</p>
+						<p>货代：{{item.agentName}}</p>
+					</view>
 				</view>
-			</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#fff" />
 		</view>
 	</view>
 </template>

pages/shipWork/documentList.vue

@@ -60,10 +60,6 @@
 						name: "安全巡检",
 						url: "patrol"
 					},
-					// {
-					// 	name: "船舶载货量",
-					// 	url: "mixWork"
-					// },
 					{
 						name: "船舶资料",
 						url: "shipInfo"

pages/shipWork/index.vue

@@ -5,19 +5,14 @@
 			<side-bar path='3'></side-bar>
 			<view class="content">
 				<view class="form">
-					<view class="select">
-						<uni-data-select v-model="pamValue" :localdata="pamList" @change="pamChange"
-							placeholder="请选择港口">
-						</uni-data-select>
-					</view>
 					<view class="select">
 						<superwei-combox :candidates="shipList" :isJSON="true" keyName="spmName" placeholder="请选择船名航次"
 							v-model="shipName" @input="input_json" @select="select_json"></superwei-combox>
 					</view>
-					<van-button type="default" @click="search">搜索</van-button>
+					<button class="searchBtn" type="default" @click="search">搜索</button>
 				</view>
 				<view class="itemList">
-					<template v-if="total != 0">
+					<template v-if="itemList.length > 0">
 						<view v-for="(item, index) in itemList" :key="index" class="item" @click="toGo(item)">
 							<view class="title">
 								<view class="name">
@@ -71,10 +66,8 @@
 								</view>
 								<view class="footer">
 									<view class="footer">
-										<van-button class="fitem" type="default"
+										<button class="fitem" type="default" @click.stop="download(item)">下载</button>
-											@click.stop="download(item)">下载</van-button>
+										<button class="fitem" type="default" @click.stop="upload(item)">上传</button>
-										<van-button class="fitem" type="default"
-											@click.stop="upload(item)">上传</van-button>
 									</view>
 								</view>
 							</view>
@@ -82,7 +75,7 @@
 					</template>
 					<o-empty v-else height="70vh" bg="#f5f6fa" />
 				</view>
-				<view class="pageBox" v-if="total != 0">
+				<view class="pageBox" v-if="itemList.length > 0">
 					<uni-pagination :show-icon="true" :total="total" :pageSize="pageSize" :current="current"
 						@change="changePage" />
 				</view>
@@ -100,7 +93,7 @@
 			return {
 				// 港口
 				pamValue: "",
-				pamList: [],
+				// pamList: [],
 				// 船名航次
 				shipName: "",
 				shipValue: '',
@@ -121,7 +114,7 @@
 			HeadInfo,
 		},
 		mounted() {
-			this.getPam();
+			this.pamValue = uni.getStorageSync('portObj').portId
 		},
 		methods: {
 			// 获取船的数据
@@ -160,28 +153,6 @@
 				this.current = e.current;
 				this.initData()
 			},
-			// 获取港区下拉数据
-			getPam() {
-				uni.request({
-					url: this.$local + '/api/shipOperate/queryPortArea',
-					header: {
-						'Content-Type': 'application/json' //自定义请求头信息
-					},
-					method: 'GET', //请求方式，必须为大写
-					success: (res) => {
-						console.log('接口返回------', res);
-						if (res.statusCode === 200) {
-							let arr = res.data.data;
-							arr.forEach((v, index) => {
-								this.pamList.push({
-									text: v.pamName,
-									value: v.pamId
-								})
-							})
-						}
-					}
-				})
-			},
 			// 获取船名航次下拉数据
 			getShip() {
 				uni.request({
@@ -198,8 +169,6 @@
 					}
 				})
 			},
-			// 港区下拉
-			pamChange(event) {},
 			// 船名航次下拉模糊查询
 			input_json(e) {
 				this.shipInput = e;
@@ -212,7 +181,17 @@
 			},
 			// 点击搜索
 			search() {
-				this.initData()
+				this.itemList = [{
+					uploadTime: "1",
+					uploadStatusDesc: "2",
+					actualBerthageName: "3",
+					planBerthageName: "4",
+					outTradeTypeName: "5",
+					outVvyName: "6",
+					inTradeTypeName: "7",
+					inVvyName: "8"
+				}]
+				// this.initData()
 			},
 			// 下载
 			download(item) {
@@ -469,9 +448,10 @@
 				margin-left: 15px;
 			}
 
-			/deep/.van-button {
+			.searchBtn {
 				height: 35px;
 				line-height: 35px;
+				margin-left: 0;
 			}
 		}
 

pages/shipWork/mafi.vue

@@ -1,16 +1,22 @@
 <template>
 	<view class="mafi">
 		<view class="container">
-			<view class="ul">
+			<view class="signBox">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+				<p class="sign" @click="sign">点击签名</p>
-					<view class="title">马菲板号：{{item.mafiBarcode}}</view>
-					<p>上传状态：未上传</p>
-					<p>尺码：{{item.size}}</p>
-					<p>类型：{{item.lxTextValue}}</p>
-					<p>装卸方式：{{item.loaderType}}</p>
-					<p>航次：{{item.vvyName}}</p>
-				</view>
 			</view>
+			<template v-if="infoList.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+						<view class="title">马菲板号：{{item.mafiBarcode}}</view>
+						<p>上传状态：未上传</p>
+						<p>尺码：{{item.size}}</p>
+						<p>类型：{{item.lxTextValue}}</p>
+						<p>装卸方式：{{item.loaderType}}</p>
+						<p>航次：{{item.vvyName}}</p>
+					</view>
+				</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -29,6 +35,13 @@
 			this.infoList = uni.getStorageSync('addMafiArr')
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('mafiRow', item);
@@ -51,6 +64,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.ul {
 				padding: 20px 0;
 

pages/shipWork/mafiAdd.vue

@@ -49,6 +49,10 @@
 					<text v-else>{{loaderType}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -183,8 +187,8 @@
 					url: '/pages/shipWork/mafi'
 				})
 			},
-			// 删除
+			// 弹框删除
-			del() {
+			delConfirm() {
 				let addMafiArr = uni.getStorageSync('addMafiArr')
 				addMafiArr.splice(this.mafiRowIndex, 1)
 				uni.setStorageSync('addMafiArr', addMafiArr);
@@ -192,6 +196,10 @@
 					url: '/pages/shipWork/mafi'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addMafiArr = uni.getStorageSync('addMafiArr')

pages/shipWork/mixWork.vue

@@ -1,31 +1,40 @@
 <template>
 	<view class="mixWork">
 		<view class="container">
+			<view class="signBox">
+				<p class="sign" @click="sign">点击签名</p>
+			</view>
 			<view class="tabsList">
 				<view class="tabsBox" v-for="(item,index) in tabsList" :key="index" :class="{active:tabsIndex == index}"
 					@click="tabsClick(item,index)">{{item}}</view>
 			</view>
 			<!-- 人员信息列表 -->
 			<view class="ul" v-if="tabsType == 0">
-				<view class="li" v-for="(item,index) in peopleInfo" :key="index" @click="add('look',item,index)">
+				<template v-if="peopleInfo.length > 0">
-					<view class="title">航次：{{item.vvyName}}</view>
+					<view class="li" v-for="(item,index) in peopleInfo" :key="index" @click="add('look',item,index)">
-					<p>贸易类型：{{item.tradeTypeName}}</p>
+						<view class="title">航次：{{item.vvyName}}</view>
-					<p>进出口：{{item.importExportFlagName}}</p>
+						<p>贸易类型：{{item.tradeTypeName}}</p>
-					<p>作业组数：{{item.workSuite}}</p>
+						<p>进出口：{{item.importExportFlagName}}</p>
-					<p>单船人数：{{item.shipPerson}}</p>
+						<p>作业组数：{{item.workSuite}}</p>
-					<p>状态：未上传</p>
+						<p>单船人数：{{item.shipPerson}}</p>
-				</view>
+						<p>状态：未上传</p>
+					</view>
+				</template>
+				<o-empty v-else height="70vh" bg="#f5f6fa" />
 			</view>
 			<!-- 工班信息列表 -->
 			<view class="ul" v-if="tabsType == 1">
-				<view class="li" v-for="(item,index) in shiftInfo" :key="index" @click="lookShift(item,index)">
+				<template v-if="shiftInfo.length > 0">
-					<view class="title">航次：{{item.vvyName}}</view>
+					<view class="li" v-for="(item,index) in shiftInfo" :key="index" @click="lookShift(item,index)">
-					<view class="shift" v-for="(item2,index2) in item.shiftList" :key="index2">
+						<view class="title">航次：{{item.vvyName}}</view>
-						<p>{{item2.gbTextValue}}</p>
+						<view class="shift" v-for="(item2,index2) in item.shiftList" :key="index2">
-						<span>作业开始时间：{{item2.startTime}}</span>
+							<p>{{item2.gbTextValue}}</p>
+							<span>作业开始时间：{{item2.startTime}}</span>
+						</view>
+						<view class="state">状态：未上传</view>
 					</view>
-					<view class="state">状态：未上传</view>
+				</template>
-				</view>
+				<o-empty v-else height="70vh" bg="#f5f6fa" />
 			</view>
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
@@ -50,7 +59,6 @@
 		},
 		mounted() {
 			this.tabsType = this.$route.query.infoType
-			console.log(this.tabsType)
 			if (this.tabsType != 0 && this.tabsType != 1) {
 				this.tabsType = 0
 				this.tabsIndex = 0
@@ -59,10 +67,15 @@
 			}
 			this.peopleInfo = uni.getStorageSync('addPeopleArr')
 			this.shiftInfo = uni.getStorageSync('addShiftArr')
-			console.log(this.shiftInfo)
 			this.shipInfo = uni.getStorageSync('shipInfo')
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
 			tabsClick(item, index) {
 				this.tabsIndex = index;
 				if (item == "人员信息") {
@@ -71,6 +84,7 @@
 					this.tabsType = 1;
 				}
 			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('peopleRow', item);
@@ -106,6 +120,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.tabsList {
 				display: flex;
 				justify-content: center;

pages/shipWork/notice.vue

@@ -1,15 +1,21 @@
 <template>
 	<view class="notice">
 		<view class="container">
-			<view class="ul">
+			<view class="signBox">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+				<p class="sign" @click="sign">点击签名</p>
-					<view class="title">航次：{{item.vvyName}}</view>
-					<p>状态：未上传</p>
-					<p>进出口：{{item.importExportFlagName}}</p>
-					<p>贸易类型：{{item.tradeTypeName}}</p>
-					<p>作业日期：{{item.workDate}}</p>
-				</view>
 			</view>
+			<template v-if="infoList.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+						<view class="title">航次：{{item.vvyName}}</view>
+						<p>状态：未上传</p>
+						<p>进出口：{{item.importExportFlagName}}</p>
+						<p>贸易类型：{{item.tradeTypeName}}</p>
+						<p>作业日期：{{item.workDate}}</p>
+					</view>
+				</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -28,6 +34,13 @@
 			this.infoList = uni.getStorageSync('addNoticeArr')
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('noticeRow', item);
@@ -50,6 +63,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.ul {
 				padding: 20px 0;
 

pages/shipWork/noticeAdd.vue

@@ -27,6 +27,10 @@
 					<text v-else>{{workDate}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -110,8 +114,8 @@
 					url: '/pages/shipWork/notice'
 				})
 			},
-			// 删除
+			// 弹框删除
-			del() {
+			delConfirm() {
 				let addNoticeArr = uni.getStorageSync('addNoticeArr')
 				addNoticeArr.splice(this.noticeRowIndex, 1)
 				uni.setStorageSync('addNoticeArr', addNoticeArr);
@@ -119,6 +123,10 @@
 					url: '/pages/shipWork/notice'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addNoticeArr = uni.getStorageSync('addNoticeArr')

pages/shipWork/opinion.vue

@@ -1,15 +1,21 @@
 <template>
 	<view class="opinion">
 		<view class="container">
-			<view class="ul">
+			<view class="signBox">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+				<p class="sign" @click="sign">点击签名</p>
-					<view class="title">航次：{{item.vvyName}}</view>
-					<p>状态：未上传</p>
-					<p>进出口：{{item.importExportFlagName}}</p>
-					<p>贸易类型：{{item.tradeTypeName}}</p>
-					<p>作业日期：{{item.workTime}}</p>
-				</view>
 			</view>
+			<template v-if="infoList.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+						<view class="title">航次：{{item.vvyName}}</view>
+						<p>状态：未上传</p>
+						<p>进出口：{{item.importExportFlagName}}</p>
+						<p>贸易类型：{{item.tradeTypeName}}</p>
+						<p>作业日期：{{item.workTime}}</p>
+					</view>
+				</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view>
 				<view class="addBtn" @click="add('add')">+ 新增</view>
 			</view>
@@ -30,6 +36,13 @@
 			this.infoList = uni.getStorageSync('addOpinionArr')
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('opinionRow', item);
@@ -52,6 +65,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.ul {
 				padding: 20px 0;
 

pages/shipWork/opinionAdd.vue

@@ -49,6 +49,10 @@
 					<text v-else>{{workTime}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -182,8 +186,8 @@
 					url: '/pages/shipWork/opinion'
 				})
 			},
-			// 删除
+			// 弹框删除
-			del() {
+			delConfirm() {
 				let addOpinionArr = uni.getStorageSync('addOpinionArr')
 				addOpinionArr.splice(this.opinionRowIndex, 1)
 				uni.setStorageSync('addOpinionArr', addOpinionArr);
@@ -191,6 +195,10 @@
 					url: '/pages/shipWork/opinion'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addOpinionArr = uni.getStorageSync('addOpinionArr')

pages/shipWork/patrol.vue

@@ -1,15 +1,18 @@
 <template>
 	<view class="patrol">
 		<view class="container">
-			<view class="ul">
+			<template v-if="infoList.length > 0">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+				<view class="ul">
-					<view class="title">类型：{{item.type}}</view>
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
-					<p>上传状态：未上传</p>
+						<view class="title">类型：{{item.type}}</view>
-					<p>航次：{{item.vvyName}}</p>
+						<p>上传状态：未上传</p>
-					<p>贸易类型：{{item.tradeTypeName}}</p>
+						<p>航次：{{item.vvyName}}</p>
-					<p>进出口：{{item.importExportFlagName}}</p>
+						<p>贸易类型：{{item.tradeTypeName}}</p>
+						<p>进出口：{{item.importExportFlagName}}</p>
+					</view>
 				</view>
-			</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>

pages/shipWork/patrolAdd.vue

@@ -46,6 +46,10 @@
 					<text v-else>{{remark}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -135,8 +139,8 @@
 					url: '/pages/shipWork/patrol'
 				})
 			},
-			// 删除
+			// 弹框删除
-			del() {
+			delConfirm() {
 				let addPatrolArr = uni.getStorageSync('addPatrolArr')
 				addPatrolArr.splice(this.patrolRowIndex, 1)
 				uni.setStorageSync('addPatrolArr', addPatrolArr);
@@ -144,6 +148,10 @@
 					url: '/pages/shipWork/patrol'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addPatrolArr = uni.getStorageSync('addPatrolArr')

pages/shipWork/peopleAdd.vue

@@ -49,6 +49,10 @@
 					<text v-else>{{peopleRow.jobStartTime}} - {{peopleRow.jobEndTime}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -197,8 +201,8 @@
 					url: '/pages/shipWork/mixWork?infoType=0'
 				})
 			},
-			// 删除
+			// 弹框删除
-			del() {
+			delConfirm() {
 				let addPeopleArr = uni.getStorageSync('addPeopleArr')
 				addPeopleArr.splice(this.peopleRowIndex, 1)
 				uni.setStorageSync('addPeopleArr', addPeopleArr);
@@ -206,6 +210,10 @@
 					url: '/pages/shipWork/mixWork?infoType=0'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addPeopleArr = uni.getStorageSync('addPeopleArr')

pages/shipWork/shiftAdd.vue

@@ -27,40 +27,45 @@
 						<uni-data-select v-model="zxValue" :localdata="zxList" @change="zxChange"></uni-data-select>
 					</view>
 				</view>
-				<view class="ulTop"><text @click="ulAdd1">添加</text><van-icon name="arrow-down" /></view>
+				<view class="widthLi" v-for="(item,index) in ulList1" :key="index+'ul'">
-				<view class="ul ul2" v-for="(item,index) in ulList1" :key="index+'ul'">
+					<view class="ulTop"><text @click="ulAdd1">添加工班</text><text v-if="index > 0"
-					<view class="li">
+							@click="delGb(index)">删除</text><van-icon name="arrow-down" /></view>
-						<p class="liTitle"><text class="required">*</text>工班：</p>
+					<view class="ul">
-						<uni-data-select v-model="item.gbValue" :localdata="gbList"
+						<view class="li">
-							@change="gbChange(item,index)"></uni-data-select>
+							<p class="liTitle"><text class="required">*</text>工班：</p>
-					</view>
+							<uni-data-select v-model="item.gbValue" :localdata="gbList"
-					<view class="li">
+								@change="gbChange(item,index)"></uni-data-select>
-						<p class="liTitle"><text class="required">*</text>作业时间 ：</p>
+						</view>
-						<uni-datetime-picker v-model="item.datetime" type="datetimerange" rangeSeparator="-"
+						<view class="li">
-							@change="changeLog(item)" />
+							<p class="liTitle"><text class="required">*</text>作业时间 ：</p>
-					</view>
+							<uni-datetime-picker v-model="item.datetime" type="datetimerange" rangeSeparator="-"
-				</view>
+								@change="changeLog(item)" />
-				<view class="ulTop"><text @click="ulAdd2">添加</text><text @click="del">删除</text><van-icon
+						</view>
-						name="arrow-down" /></view>
+						<view class="widthLi" v-for="(item2,index2) in item.ulList2" :key="index2+'ul2'">
-				<view class="ul ul2" v-for="(item,index) in ulList2" :key="index+'ul2'">
+							<view class="ulTop"><text @click="ulAdd2(index)">添加工班信息</text></text><text v-if="index2 > 0"
-					<view class="li">
+									@click="delGb2(index,index2)">删除</text><van-icon name="arrow-down" /></view>
-						<p class="liTitle"><text class="required">*</text>车型：</p>
+							<view class="ul">
-						<uni-data-select v-model="item.cxValue" :localdata="cxList"
+								<view class="li">
-							@change="cxChange(item,index)"></uni-data-select>
+									<p class="liTitle"><text class="required">*</text>车型：</p>
-					</view>
+									<uni-data-select v-model="item2.cxValue" :localdata="cxList"
-					<view class="li">
+										@change="cxChange(item,index,item2,index2)"></uni-data-select>
-						<p><text class="required">*</text>数量：</p>
+								</view>
-						<uni-number-box @change="numChange" v-model="item.numValue" />
+								<view class="li">
-					</view>
+									<p><text class="required">*</text>数量：</p>
-					<view class="li">
+									<uni-number-box @change="numChange" v-model="item2.numValue" />
-						<p class="liTitle"><text class="required">*</text>装卸方式：</p>
+								</view>
-						<uni-data-select v-model="item.fsValue" :localdata="fsList"
+								<view class="li">
-							@change="fsChange(item,index)"></uni-data-select>
+									<p class="liTitle"><text class="required">*</text>装卸方式：</p>
-					</view>
+									<uni-data-select v-model="item2.fsValue" :localdata="fsList"
-					<view class="li widthLi">
+										@change="fsChange(item,index,item2,index2)"></uni-data-select>
-						<p class="liTitle">备注：</p>
+								</view>
-						<uni-easyinput type="textarea" autoHeight v-model="item.notes" placeholder="请输入任务描述(200字以内)"
+								<view class="li widthLi">
-							maxlength="200"></uni-easyinput>
+									<p class="liTitle">备注：</p>
+									<uni-easyinput type="textarea" autoHeight v-model="item2.notes"
+										placeholder="请输入任务描述(200字以内)" maxlength="200"></uni-easyinput>
+								</view>
+							</view>
+						</view>
 					</view>
 				</view>
 			</template>
@@ -68,7 +73,8 @@
 			<!-- 翻仓信息 -->
 			<template v-if="active == 1">
 				<view v-for="(item,index) in fcUlList" :key="index + 'fc'">
-					<view class="ulTop"><text @click="fcAdd">添加</text><van-icon name="arrow-down" /></view>
+					<view class="ulTop"><text @click="fcAdd">添加翻仓类型</text><text v-if="index > 0"
+							@click="delFc(index)">删除</text><van-icon name="arrow-down" /></view>
 					<view class="ul fcUl">
 						<view class="li">
 							<p class="liTitle"><text class="required">*</text>翻仓类型：</p>
@@ -77,8 +83,8 @@
 						</view>
 					</view>
 					<view v-for="(item2,index2) in item.fcUlList2" :key="index2 + 'fc2'">
-						<view class="ulTop"><text @click="fcAdd2(index)">添加</text></text><text v-if="index2 > 0"
+						<view class="ulTop"><text @click="fcAdd2(index)">添加翻仓信息</text></text><text v-if="index2 > 0"
-								@click="delFc(index,index2)">删除</text><van-icon name="arrow-down" /></view>
+								@click="delFc2(index,index2)">删除</text><van-icon name="arrow-down" /></view>
 						<view class="ul ul2 fcUl2">
 							<view class="li">
 								<p class="liTitle"><text class="required">*</text>翻舱起点位置：</p>
@@ -216,17 +222,17 @@
 					datetime: ['', ''],
 					startTime: "",
 					endTime: "",
+					ulList2: [{
+						cxValue: "",
+						cxTextValue: "",
+						numValue: 0,
+						fsValue: "",
+						fsTextValue: "",
+						notes: "",
+					}],
 				}],
 				// 工班下拉框
 				gbList: [],
-				ulList2: [{
-					cxValue: "",
-					cxTextValue: "",
-					numValue: 0,
-					fsValue: "",
-					fsTextValue: "",
-					notes: "",
-				}],
 				// 车型下拉
 				cxList: [],
 				// 装卸方式下拉
@@ -336,7 +342,6 @@
 				this.zxValue = this.dataInfo.zxId
 				this.zxTextValue = this.dataInfo.zxTextValue
 				this.ulList1 = this.dataInfo.shiftList
-				this.ulList2 = this.dataInfo.shiftList2
 				this.fcUlList = this.dataInfo.fcList
 				this.otherObj = this.dataInfo.otherList
 			},
@@ -359,13 +364,28 @@
 					}
 				})
 			},
-			// 点击第一个添加
+			// 工班信息添加
 			ulAdd1() {
 				this.ulList1.push({
 					datetime: ['', ''],
 					gbValue: "",
-					gbTextValue: ""
+					gbTextValue: "",
-
+					ulList2: [{
+						cxValue: "",
+						cxTextValue: "",
+						numValue: 0,
+						fsValue: "",
+						fsTextValue: "",
+						notes: "",
+					}],
+				})
+			},
+			ulAdd2(index) {
+				this.ulList1[index].ulList2.push({
+					cxValue: "",
+					numValue: 0,
+					fsValue: "",
+					notes: "",
 				})
 			},
 			// 工班下拉
@@ -382,35 +402,30 @@
 				item.startTime = item.datetime[0].slice(0, item.datetime[0].length - 3)
 				item.endTime = item.datetime[1].slice(0, item.datetime[1].length - 3)
 			},
-			// 点击第二个添加
+			// 工班信息删除
-			ulAdd2() {
+			delGb(index) {
-				this.ulList2.push({
+				this.ulList1.splice(index, 1)
-					cxValue: "",
-					numValue: 0,
-					fsValue: "",
-					notes: "",
-				})
 			},
-			del() {
+			delGb2(index, index2) {
-				this.ulList2.splice(0, 1)
+				this.ulList1[index].ulList2.splice(index2, 1)
 			},
 			// 车型下拉
-			cxChange(item, index) {
+			cxChange(item, index, item2, index2) {
-				this.ulList2[index].cxValue = item.cxValue
+				this.ulList1[index].ulList2[index2].cxValue = item2.cxValue
 				this.cxList.forEach(v => {
-					if (v.value == item.cxValue) {
+					if (v.value == item2.cxValue) {
-						item.cxTextValue = v.text
+						item2.cxTextValue = v.text
 					}
 				})
 			},
 			// 数量
 			numChange(val) {},
 			// 装卸方式下拉
-			fsChange(item, index) {
+			fsChange(item, index, item2, index2) {
-				this.ulList2[index].fsValue = item.fsValue
+				this.ulList1[index].ulList2[index2].fsValue = item2.fsValue
 				this.fsList.forEach(v => {
-					if (v.value == item.fsValue) {
+					if (v.value == item2.fsValue) {
-						item.fsTextValue = v.text
+						item2.fsTextValue = v.text
 					}
 				})
 			},
@@ -468,7 +483,10 @@
 				})
 			},
 			// 翻仓删除
-			delFc(index, index2) {
+			delFc(index) {
+				this.fcUlList.splice(index, 1)
+			},
+			delFc2(index, index2) {
 				this.fcUlList[index].fcUlList2.splice(index2, 1)
 			},
 
@@ -495,7 +513,6 @@
 					zxName: this.zxTextValue,
 					zxId: this.zxValue,
 					shiftList: this.ulList1,
-					shiftList2: this.ulList2,
 					fcList: this.fcUlList,
 					otherList: this.otherObj
 				}
@@ -627,7 +644,6 @@
 				.widthLi {
 					width: 100%;
 				}
-
 			}
 
 			.ul2 {

pages/shipWork/shiftDetails.vue

@@ -26,7 +26,7 @@
 							<text> {{dataInfo.zxName}}</text>
 						</view>
 					</view>
-					<view class="ul bUl" v-for="(item,index) in dataInfo.shiftList" :key="index + 'a'">
+					<view class="ul bUl borTop" v-for="(item,index) in dataInfo.shiftList" :key="index + 'a'">
 						<view class="li">
 							<p>工班：</p>
 							<text> {{item.gbTextValue}}</text>
@@ -35,19 +35,19 @@
 							<p>作业时间：</p>
 							<text> {{item.startTime}} - {{item.endTime}}</text>
 						</view>
-					</view>
+						<view class="ul bUl" v-for="(item2,index2) in item.ulList2" :key="index2 + 'b'">
-					<view class="ul bUl" v-for="(item,index) in dataInfo.shiftList2" :key="index + 'b'">
+							<view class="li">
-						<view class="li">
+								<p>车型：</p>
-							<p>车型：</p>
+								<text>{{item2.cxTextValue}}</text>
-							<text>{{item.cxTextValue}}</text>
+							</view>
-						</view>
+							<view class="li">
-						<view class="li">
+								<p>数量：</p>
-							<p>数量：</p>
+								<text>{{item2.numValue}}</text>
-							<text>{{item.numValue}}</text>
+							</view>
-						</view>
+							<view class="li wLi">
-						<view class="li wLi">
+								<p>备注：</p>
-							<p>备注：</p>
+								<text>{{item2.notes}}</text>
-							<text>{{item.notes}}</text>
+							</view>
 						</view>
 					</view>
 				</custom-tab-pane>
@@ -135,6 +135,10 @@
 					</view>
 				</custom-tab-pane>
 			</custom-tabs>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" @click="del">删除</van-button>
@@ -177,8 +181,8 @@
 					url: '/pages/shipWork/mixWork?infoType=1'
 				})
 			},
-			// 删除
+			// 弹框删除
-			del() {
+			delConfirm() {
 				let addShiftArr = uni.getStorageSync('addShiftArr')
 				addShiftArr.splice(this.shiftRowIndex, 1)
 				uni.setStorageSync('addShiftArr', addShiftArr);
@@ -186,6 +190,10 @@
 					url: '/pages/shipWork/mixWork?infoType=1'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 编辑
 			edit(state) {
 				this.obj = {
@@ -216,14 +224,6 @@
 					line-height: 35px;
 					font-size: 16px;
 				}
-
-				.ul {
-					border-bottom: 1px dashed #ccc;
-				}
-
-				.ul:last-child {
-					border: none;
-				}
 			}
 
 			.otherInfo {
@@ -236,12 +236,6 @@
 				}
 			}
 
-			.ul[data-v-298cacec] {
-				display: flex;
-				justify-content: space-between;
-				flex-wrap: wrap;
-			}
-
 			.ul {
 				display: flex;
 				justify-content: space-between;
@@ -266,9 +260,17 @@
 			}
 
 			.bUl {
+				width: 100%;
+			}
+
+			.borTop {
 				border-top: 1px solid #999;
 			}
 
+			.borBtm {
+				border-bottom: 1px solid #999;
+			}
+
 			.btnList {
 				display: flex;
 				justify-content: center;

pages/shipWork/sign.vue

@@ -0,0 +1,225 @@
+<template>
+	<view class="container">
+		<view class="sigh-btns">
+			<van-button class="btn" type="default" @tap="handleCancel">取消</van-button>
+			<van-button class="btn" type="default" @tap="handleReset">重写</van-button>
+			<van-button class="btn" type="default" @tap="handleConfirm">确认</van-button>
+			<!-- <button class="btn" @tap="handleCancel">取消</button>
+			<button class="btn" @tap="handleReset">重写</button>
+			<button class="btn" @tap="handleConfirm">确认</button> -->
+		</view>
+		<view class="sign-box">
+			<canvas class="mycanvas" :style="{width:width +'px',height:height +'px'}" canvas-id="mycanvas"
+				@touchstart="touchstart" @touchmove="touchmove" @touchend="touchend"></canvas>
+
+			<canvas canvas-id="camCacnvs" :style="{width:height +'px',height:width +'px'}" class="canvsborder"></canvas>
+
+		</view>
+	</view>
+
+</template>
+<script>
+	var x = 20;
+	var y = 20;
+	var tempPoint = []; //用来存放当前画纸上的轨迹点
+	var id = 0;
+	var type = '';
+	let that;
+	let canvasw;
+	let canvash;
+	export default {
+		data() {
+			return {
+				ctx: '', //绘图图像
+				points: [], //路径点集合,
+				width: 0,
+				height: 0
+			};
+		},
+		mounted() {},
+
+		onLoad(option) {
+			that = this;
+			console.log(option);
+			id = option.id;
+			type = option.type;
+			this.ctx = uni.createCanvasContext('mycanvas', this); //创建绘图对象
+			//设置画笔样式
+			this.ctx.lineWidth = 4;
+			this.ctx.lineCap = 'round';
+			this.ctx.lineJoin = 'round';
+
+			uni.getSystemInfo({
+				success: function(res) {
+					console.log(res);
+					that.width = res.windowWidth * 0.8;
+					that.height = res.windowHeight * 0.85;
+				}
+			});
+		},
+
+		methods: {
+			//触摸开始，获取到起点
+			touchstart: function(e) {
+				let startX = e.changedTouches[0].x;
+				let startY = e.changedTouches[0].y;
+				let startPoint = {
+					X: startX,
+					Y: startY
+				};
+
+				/* **************************************************
+				    #由于uni对canvas的实现有所不同，这里需要把起点存起来
+				 * **************************************************/
+				this.points.push(startPoint);
+
+				//每次触摸开始，开启新的路径
+				this.ctx.beginPath();
+			},
+
+			//触摸移动，获取到路径点
+			touchmove: function(e) {
+				let moveX = e.changedTouches[0].x;
+				let moveY = e.changedTouches[0].y;
+				let movePoint = {
+					X: moveX,
+					Y: moveY
+				};
+				this.points.push(movePoint); //存点
+				let len = this.points.length;
+				if (len >= 2) {
+					this.draw(); //绘制路径
+				}
+				tempPoint.push(movePoint);
+			},
+
+			// 触摸结束，将未绘制的点清空防止对后续路径产生干扰
+			touchend: function() {
+				this.points = [];
+			},
+
+			/* ***********************************************	
+			#   绘制笔迹
+			#   1.为保证笔迹实时显示，必须在移动的同时绘制笔迹
+			#   2.为保证笔迹连续，每次从路径集合中区两个点作为起点（moveTo）和终点(lineTo)
+			#   3.将上一次的终点作为下一次绘制的起点（即清除第一个点）
+			************************************************ */
+			draw: function() {
+				let point1 = this.points[0];
+				let point2 = this.points[1];
+				this.points.shift();
+				this.ctx.moveTo(point1.X, point1.Y);
+				this.ctx.lineTo(point2.X, point2.Y);
+				this.ctx.stroke();
+				this.ctx.draw(true);
+			},
+
+			handleCancel() {
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+
+			//清空画布
+			handleReset: function() {
+				console.log('handleReset');
+				that.ctx.clearRect(0, 0, that.width, that.height);
+				that.ctx.draw(true);
+				tempPoint = [];
+			},
+
+			//将签名笔迹上传到服务器，并将返回来的地址存到本地
+			handleConfirm: function() {
+				if (tempPoint.length == 0) {
+					uni.showToast({
+						title: '请先签名',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				uni.canvasToTempFilePath({
+					canvasId: 'mycanvas',
+					success: function(res) {
+						let tempPath = res.tempFilePath;
+						console.log(tempPath)
+
+						const ctx = uni.createCanvasContext('camCacnvs', that);
+						ctx.translate(0, that.width);
+						ctx.rotate((-90 * Math.PI) / 180);
+						ctx.drawImage(tempPath, 0, 0, that.width, that.height);
+						ctx.draw();
+						setTimeout(() => {
+
+							//保存签名图片到本地
+							uni.canvasToTempFilePath({
+									canvasId: 'camCacnvs',
+									success: function(res) {
+										//这是签名图片文件的本地临时地址
+										let path = res.tempFilePath;
+
+									},
+									fail: err => {
+										console.log('fail', err);
+									}
+								},
+								this
+							);
+						}, 200);
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		display: flex;
+		flex-direction: row;
+		height: 100%;
+		padding: 50px 0;
+	}
+
+	.sign-box {
+		width: 80%;
+		height: 90%;
+		margin: auto;
+		display: flex;
+		flex-direction: column;
+		text-align: center;
+	}
+
+	.sign-view {
+		height: 100%;
+	}
+
+	.sigh-btns {
+		height: 100%;
+		margin: auto;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+	}
+
+	.btn {
+		margin: 30px 0px;
+		padding: 8rpx;
+		transform: rotate(90deg);
+		border: grey 1rpx solid;
+		width: 100px;
+		height: 50px;
+	}
+
+	.mycanvas {
+		margin: auto 0rpx;
+		background-color: #ececec;
+	}
+
+	.canvsborder {
+		border: 1rpx solid #333;
+		position: fixed;
+		top: 0;
+		left: 10000rpx;
+	}
+</style>

pages/shipWork/supply.vue

@@ -1,15 +1,21 @@
 <template>
 	<view class="supply">
 		<view class="container">
-			<view class="ul">
+			<view class="signBox">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+				<p class="sign" @click="sign">点击签名</p>
-					<view class="title">类型：{{item.supplyType}}</view>
-					<p>状态：未上传</p>
-					<p>航次：{{item.vvyName}}</p>
-					<p>进出口：{{item.importExportFlagName}}</p>
-					<p>贸易类型：{{item.tradeTypeName}}</p>
-				</view>
 			</view>
+			<template v-if="infoList.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+						<view class="title">类型：{{item.supplyType}}</view>
+						<p>状态：未上传</p>
+						<p>航次：{{item.vvyName}}</p>
+						<p>进出口：{{item.importExportFlagName}}</p>
+						<p>贸易类型：{{item.tradeTypeName}}</p>
+					</view>
+				</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -29,6 +35,13 @@
 			console.log(this.infoList)
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('supplyRow', item);
@@ -51,6 +64,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.ul {
 				padding: 20px 0;
 

pages/shipWork/supplyAdd.vue

@@ -44,6 +44,10 @@
 					<text v-else>{{supplyDate}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -170,8 +174,8 @@
 					url: '/pages/shipWork/supply'
 				})
 			},
-			// 删除
+			// 弹框删除
-			del() {
+			delConfirm() {
 				let addSupplyArr = uni.getStorageSync('addSupplyArr')
 				addSupplyArr.splice(this.supplyRowIndex, 1)
 				uni.setStorageSync('addSupplyArr', addSupplyArr);
@@ -179,6 +183,10 @@
 					url: '/pages/shipWork/supply'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addSupplyArr = uni.getStorageSync('addSupplyArr')

pages/shipWork/untieAdd.vue

@@ -52,6 +52,10 @@
 					<text v-else>{{noProductBerthTime}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -179,8 +183,8 @@
 					url: '/pages/shipWork/untieCord'
 				})
 			},
-			// 删除
+			// 弹框删除
-			del() {
+			delConfirm() {
 				let addUntieArr = uni.getStorageSync('addUntieArr')
 				addUntieArr.splice(this.untieRowIndex, 1)
 				uni.setStorageSync('addUntieArr', addUntieArr);
@@ -188,6 +192,10 @@
 					url: '/pages/shipWork/untieCord'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addUntieArr = uni.getStorageSync('addUntieArr')

pages/shipWork/untieCord.vue

@@ -1,16 +1,22 @@
 <template>
 	<view class="untieCord">
 		<view class="container">
-			<view class="ul">
+			<view class="signBox">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+				<p class="sign" @click="sign">点击签名</p>
-					<view class="title">航次：{{item.vvyName}}</view>
-					<p>状态：未上传</p>
-					<p>进出口：{{item.importExportFlagName}}</p>
-					<p>贸易类型：{{item.tradeTypeName}}</p>
-					<p>泊位：{{item.bthIdName}}</p>
-					<p>系缆时间：{{item.attachTime}}</p>
-				</view>
 			</view>
+			<template v-if="infoList.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+						<view class="title">航次：{{item.vvyName}}</view>
+						<p>状态：未上传</p>
+						<p>进出口：{{item.importExportFlagName}}</p>
+						<p>贸易类型：{{item.tradeTypeName}}</p>
+						<p>泊位：{{item.bthIdName}}</p>
+						<p>系缆时间：{{item.attachTime}}</p>
+					</view>
+				</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -29,6 +35,13 @@
 			this.infoList = uni.getStorageSync('addUntieArr')
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('untieRow', item);
@@ -51,6 +64,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.ul {
 				padding: 20px 0;
 

pages/shipWork/workAssign.vue

@@ -1,15 +1,21 @@
 <template>
 	<view class="workAssign">
 		<view class="container">
-			<view class="ul">
+			<view class="signBox">
-				<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+				<p class="sign" @click="sign">点击签名</p>
-					<view class="title">航次：{{item.vvyName}}</view>
-					<p>状态：未上传</p>
-					<p>进出口：{{item.importExportFlagName}}</p>
-					<p>贸易类型：{{item.tradeTypeName}}</p>
-					<p>作业时间：{{item.startTime}} - {{item.endTime}}</p>
-				</view>
 			</view>
+			<template v-if="infoList.length > 0">
+				<view class="ul">
+					<view class="li" v-for="(item,index) in infoList" :key="index" @click="add('look',item,index)">
+						<view class="title">航次：{{item.vvyName}}</view>
+						<p>状态：未上传</p>
+						<p>进出口：{{item.importExportFlagName}}</p>
+						<p>贸易类型：{{item.tradeTypeName}}</p>
+						<p>作业时间：{{item.startTime}} - {{item.endTime}}</p>
+					</view>
+				</view>
+			</template>
+			<o-empty v-else height="70vh" bg="#f5f6fa" />
 			<view class="addBtn" @click="add('add')">+ 新增</view>
 		</view>
 	</view>
@@ -28,6 +34,13 @@
 			this.infoList = uni.getStorageSync('addAssignArr')
 		},
 		methods: {
+			// 点击签名
+			sign() {
+				uni.navigateTo({
+					url: '/pages/shipWork/sign'
+				})
+			},
+			// 点击新增
 			add(state, item, index) {
 				if (state != 'add') {
 					uni.setStorageSync('assignRow', item);
@@ -50,6 +63,19 @@
 		.container {
 			padding: 30px 20px;
 
+			.signBox {
+				display: flex;
+				justify-content: flex-end;
+
+				.sign {
+					text-align: right;
+					color: #2979ff;
+					padding: 10px;
+					background: #fff;
+					border: 1px solid #ccc;
+				}
+			}
+
 			.ul {
 				padding: 20px 0;
 

pages/shipWork/workAssignAdd.vue

@@ -60,6 +60,10 @@
 					<text v-else>{{startTime}} - {{endTime}}</text>
 				</view>
 			</view>
+			<uni-popup ref="popup" type="dialog">
+				<uni-popup-dialog type="error" confirmText="确定" title="通知" content="是否删除此条数据"
+					@confirm="delConfirm"></uni-popup-dialog>
+			</uni-popup>
 			<view class="btnList">
 				<van-button type="default" @click="cancel">取消</van-button>
 				<van-button type="danger" v-if="obj.state == 'look'" @click="del">删除</van-button>
@@ -224,8 +228,8 @@
 					url: '/pages/shipWork/workAssign'
 				})
 			},
-			// 删除
+			// 弹框删除
-			del() {
+			delConfirm() {
 				let addAssignArr = uni.getStorageSync('addAssignArr')
 				addAssignArr.splice(this.assignRowIndex, 1)
 				uni.setStorageSync('addAssignArr', addAssignArr);
@@ -233,6 +237,10 @@
 					url: '/pages/shipWork/workAssign'
 				})
 			},
+			// 删除
+			del() {
+				this.$refs.popup.open()
+			},
 			// 保存
 			save() {
 				let addAssignArr = uni.getStorageSync('addAssignArr')

uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue

@@ -12,12 +12,18 @@
 					<view v-else class="uni-date-x uni-date-range">
 						<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
 						<view class="uni-date__x-input text-center">
-							{{ displayRangeValue.startDate || startPlaceholderText }}</view>
+
+							{{ displayRangeValue.startDate || startPlaceholderText }}
+						</view>
+
 
 						<view class="range-separator">{{rangeSeparator}}</view>
 
 						<view class="uni-date__x-input text-center">
-							{{ displayRangeValue.endDate || endPlaceholderText }}</view>
+
+							{{ displayRangeValue.endDate || endPlaceholderText }}
+						</view>
+
 					</view>
 
 					<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">

wxcomponents/vant/dist/action-sheet/index.d.ts

@@ -0,0 +1 @@
+export {};

wxcomponents/vant/dist/action-sheet/index.js

@@ -0,0 +1,71 @@
+import { VantComponent } from '../common/component';
+import { button } from '../mixins/button';
+VantComponent({
+    classes: ['list-class'],
+    mixins: [button],
+    props: {
+        show: Boolean,
+        title: String,
+        cancelText: String,
+        description: String,
+        round: {
+            type: Boolean,
+            value: true,
+        },
+        zIndex: {
+            type: Number,
+            value: 100,
+        },
+        actions: {
+            type: Array,
+            value: [],
+        },
+        overlay: {
+            type: Boolean,
+            value: true,
+        },
+        closeOnClickOverlay: {
+            type: Boolean,
+            value: true,
+        },
+        closeOnClickAction: {
+            type: Boolean,
+            value: true,
+        },
+        safeAreaInsetBottom: {
+            type: Boolean,
+            value: true,
+        },
+    },
+    methods: {
+        onSelect(event) {
+            const { index } = event.currentTarget.dataset;
+            const { actions, closeOnClickAction, canIUseGetUserProfile } = this.data;
+            const item = actions[index];
+            if (item) {
+                this.$emit('select', item);
+                if (closeOnClickAction) {
+                    this.onClose();
+                }
+                if (item.openType === 'getUserInfo' && canIUseGetUserProfile) {
+                    wx.getUserProfile({
+                        desc: item.getUserProfileDesc || '  ',
+                        complete: (userProfile) => {
+                            this.$emit('getuserinfo', userProfile);
+                        },
+                    });
+                }
+            }
+        },
+        onCancel() {
+            this.$emit('cancel');
+        },
+        onClose() {
+            this.$emit('close');
+        },
+        onClickOverlay() {
+            this.$emit('click-overlay');
+            this.onClose();
+        },
+    },
+});

wxcomponents/vant/dist/action-sheet/index.json

@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-popup": "../popup/index",
+    "van-loading": "../loading/index"
+  }
+}

wxcomponents/vant/dist/action-sheet/index.vue

@@ -0,0 +1,112 @@
+<template>
+<uni-shadow-root class="vant-dist-action-sheet-index"><van-popup :show="show" position="bottom" :round="round" :z-index="zIndex" :overlay="overlay" custom-class="van-action-sheet custom-class" :safe-area-inset-bottom="safeAreaInsetBottom" :close-on-click-overlay="closeOnClickOverlay" @close="onClickOverlay">
+  <view v-if="title" class="van-action-sheet__header">
+    {{ title }}
+    <van-icon name="cross" custom-class="van-action-sheet__close" @click="onClose"></van-icon>
+  </view>
+  <view v-if="description" class="van-action-sheet__description van-hairline--bottom">
+    {{ description }}
+  </view>
+  <view v-if="actions && actions.length" class="list-class">
+    
+    <button v-for="(item,index) in (actions)" :key="item.index" :open-type="item.disabled || item.loading || (canIUseGetUserProfile && item.openType === 'getUserInfo') ? '' : item.openType" :style="item.color ? 'color: ' + item.color : ''" :class="(utils.bem('action-sheet__item', { disabled: item.disabled || item.loading }))+' '+(item.className || '')" hover-class="van-action-sheet__item--hover" :data-index="index" @click="_$self[(item.disabled || item.loading ? '' : 'onSelect')||'_$noop']($event)" @getuserinfo="onGetUserInfo" @contact="onContact" @getphonenumber="onGetPhoneNumber" @error="onError" @launchapp="onLaunchApp" @opensetting="onOpenSetting" :lang="lang" :session-from="sessionFrom" :send-message-title="sendMessageTitle" :send-message-path="sendMessagePath" :send-message-img="sendMessageImg" :show-message-card="showMessageCard" :app-parameter="appParameter">
+      <block v-if="(!item.loading)">
+        {{ item.name }}
+        <view v-if="item.subname" class="van-action-sheet__subname">{{ item.subname }}</view>
+      </block>
+      <van-loading v-else custom-class="van-action-sheet__loading" size="22px"></van-loading>
+    </button>
+  </view>
+  <slot></slot>
+  <block v-if="cancelText">
+    <view class="van-action-sheet__gap"></view>
+    <view class="van-action-sheet__cancel" hover-class="van-action-sheet__cancel--hover" hover-stay-time="70" @click="onCancel">
+      {{ cancelText }}
+    </view>
+  </block>
+</van-popup></uni-shadow-root>
+</template>
+<wxs src="../wxs/utils.wxs" module="utils"></wxs>
+<script>
+import VanIcon from '../icon/index.vue'
+import VanPopup from '../popup/index.vue'
+import VanLoading from '../loading/index.vue'
+global['__wxVueOptions'] = {components:{'van-icon': VanIcon,'van-popup': VanPopup,'van-loading': VanLoading}}
+
+global['__wxRoute'] = 'vant/dist/action-sheet/index'
+import { VantComponent } from '../common/component';
+import { button } from '../mixins/button';
+VantComponent({
+    classes: ['list-class'],
+    mixins: [button],
+    props: {
+        show: Boolean,
+        title: String,
+        cancelText: String,
+        description: String,
+        round: {
+            type: Boolean,
+            value: true,
+        },
+        zIndex: {
+            type: Number,
+            value: 100,
+        },
+        actions: {
+            type: Array,
+            value: [],
+        },
+        overlay: {
+            type: Boolean,
+            value: true,
+        },
+        closeOnClickOverlay: {
+            type: Boolean,
+            value: true,
+        },
+        closeOnClickAction: {
+            type: Boolean,
+            value: true,
+        },
+        safeAreaInsetBottom: {
+            type: Boolean,
+            value: true,
+        },
+    },
+    methods: {
+        onSelect(event) {
+            const { index } = event.currentTarget.dataset;
+            const { actions, closeOnClickAction, canIUseGetUserProfile } = this.data;
+            const item = actions[index];
+            if (item) {
+                this.$emit('select', item);
+                if (closeOnClickAction) {
+                    this.onClose();
+                }
+                if (item.openType === 'getUserInfo' && canIUseGetUserProfile) {
+                    wx.getUserProfile({
+                        desc: item.getUserProfileDesc || '  ',
+                        complete: (userProfile) => {
+                            this.$emit('getuserinfo', userProfile);
+                        },
+                    });
+                }
+            }
+        },
+        onCancel() {
+            this.$emit('cancel');
+        },
+        onClose() {
+            this.$emit('close');
+        },
+        onClickOverlay() {
+            this.$emit('click-overlay');
+            this.onClose();
+        },
+    },
+});
+export default global['__wxComponents']['vant/dist/action-sheet/index']
+</script>
+<style platform="mp-weixin">
+@import '../common/index.css';.van-action-sheet{color:var(--action-sheet-item-text-color,#323233);max-height:var(--action-sheet-max-height,90%)!important}.van-action-sheet__cancel,.van-action-sheet__item{background-color:var(--action-sheet-item-background,#fff);font-size:var(--action-sheet-item-font-size,16px);line-height:var(--action-sheet-item-line-height,22px);padding:14px 16px;text-align:center}.van-action-sheet__cancel--hover,.van-action-sheet__item--hover{background-color:#f2f3f5}.van-action-sheet__cancel:after,.van-action-sheet__item:after{border-width:0}.van-action-sheet__cancel{color:var(--action-sheet-cancel-text-color,#646566)}.van-action-sheet__gap{background-color:var(--action-sheet-cancel-padding-color,#f7f8fa);display:block;height:var(--action-sheet-cancel-padding-top,8px)}.van-action-sheet__item--disabled{color:var(--action-sheet-item-disabled-text-color,#c8c9cc)}.van-action-sheet__item--disabled.van-action-sheet__item--hover{background-color:var(--action-sheet-item-background,#fff)}.van-action-sheet__subname{color:var(--action-sheet-subname-color,#969799);font-size:var(--action-sheet-subname-font-size,12px);line-height:var(--action-sheet-subname-line-height,20px);margin-top:var(--padding-xs,8px)}.van-action-sheet__header{font-size:var(--action-sheet-header-font-size,16px);font-weight:var(--font-weight-bold,500);line-height:var(--action-sheet-header-height,48px);text-align:center}.van-action-sheet__description{color:var(--action-sheet-description-color,#969799);font-size:var(--action-sheet-description-font-size,14px);line-height:var(--action-sheet-description-line-height,20px);padding:20px var(--padding-md,16px);text-align:center}.van-action-sheet__close{color:var(--action-sheet-close-icon-color,#c8c9cc);font-size:var(--action-sheet-close-icon-size,22px)!important;line-height:inherit!important;padding:var(--action-sheet-close-icon-padding,0 16px);position:absolute!important;right:0;top:0}.van-action-sheet__loading{display:flex!important}
+</style>

wxcomponents/vant/dist/action-sheet/index.wxml

@@ -0,0 +1,69 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<van-popup
+  show="{{ show }}"
+  position="bottom"
+  round="{{ round }}"
+  z-index="{{ zIndex }}"
+  overlay="{{ overlay }}"
+  custom-class="van-action-sheet custom-class"
+  safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
+  close-on-click-overlay="{{ closeOnClickOverlay }}"
+  bind:close="onClickOverlay"
+>
+  <view wx:if="{{ title }}" class="van-action-sheet__header">
+    {{ title }}
+    <van-icon
+      name="cross"
+      custom-class="van-action-sheet__close"
+      bind:click="onClose"
+    />
+  </view>
+  <view wx:if="{{ description }}" class="van-action-sheet__description van-hairline--bottom">
+    {{ description }}
+  </view>
+  <view wx:if="{{ actions && actions.length }}" class="list-class">
+    <!-- button外包一层view，防止actions动态变化，导致渲染时button被打散 -->
+    <button
+      wx:for="{{ actions }}"
+      wx:key="index"
+      open-type="{{ item.disabled || item.loading || (canIUseGetUserProfile && item.openType === 'getUserInfo') ? '' : item.openType }}"
+      style="{{ item.color ? 'color: ' + item.color : '' }}"
+      class="{{ utils.bem('action-sheet__item', { disabled: item.disabled || item.loading }) }} {{ item.className || '' }}"
+      hover-class="van-action-sheet__item--hover"
+      data-index="{{ index }}"
+      bindtap="{{ item.disabled || item.loading ? '' : 'onSelect' }}"
+      bindgetuserinfo="onGetUserInfo"
+      bindcontact="onContact"
+      bindgetphonenumber="onGetPhoneNumber"
+      binderror="onError"
+      bindlaunchapp="onLaunchApp"
+      bindopensetting="onOpenSetting"
+      lang="{{ lang }}"
+      session-from="{{ sessionFrom }}"
+      send-message-title="{{ sendMessageTitle }}"
+      send-message-path="{{ sendMessagePath }}"
+      send-message-img="{{ sendMessageImg }}"
+      show-message-card="{{ showMessageCard }}"
+      app-parameter="{{ appParameter }}"
+    >
+      <block wx:if="{{ !item.loading }}">
+        {{ item.name }}
+        <view wx:if="{{ item.subname }}" class="van-action-sheet__subname" >{{ item.subname }}</view>
+      </block>
+      <van-loading wx:else custom-class="van-action-sheet__loading" size="22px" />
+    </button>
+  </view>
+  <slot />
+  <block wx:if="{{ cancelText }}">
+    <view class="van-action-sheet__gap" />
+    <view
+      class="van-action-sheet__cancel"
+      hover-class="van-action-sheet__cancel--hover"
+      hover-stay-time="70"
+      bind:tap="onCancel"
+    >
+      {{ cancelText }}
+    </view>
+  </block>
+</van-popup>

wxcomponents/vant/dist/action-sheet/index.wxss

@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-action-sheet{color:var(--action-sheet-item-text-color,#323233);max-height:var(--action-sheet-max-height,90%)!important}.van-action-sheet__cancel,.van-action-sheet__item{background-color:var(--action-sheet-item-background,#fff);font-size:var(--action-sheet-item-font-size,16px);line-height:var(--action-sheet-item-line-height,22px);padding:14px 16px;text-align:center}.van-action-sheet__cancel--hover,.van-action-sheet__item--hover{background-color:#f2f3f5}.van-action-sheet__cancel:after,.van-action-sheet__item:after{border-width:0}.van-action-sheet__cancel{color:var(--action-sheet-cancel-text-color,#646566)}.van-action-sheet__gap{background-color:var(--action-sheet-cancel-padding-color,#f7f8fa);display:block;height:var(--action-sheet-cancel-padding-top,8px)}.van-action-sheet__item--disabled{color:var(--action-sheet-item-disabled-text-color,#c8c9cc)}.van-action-sheet__item--disabled.van-action-sheet__item--hover{background-color:var(--action-sheet-item-background,#fff)}.van-action-sheet__subname{color:var(--action-sheet-subname-color,#969799);font-size:var(--action-sheet-subname-font-size,12px);line-height:var(--action-sheet-subname-line-height,20px);margin-top:var(--padding-xs,8px)}.van-action-sheet__header{font-size:var(--action-sheet-header-font-size,16px);font-weight:var(--font-weight-bold,500);line-height:var(--action-sheet-header-height,48px);text-align:center}.van-action-sheet__description{color:var(--action-sheet-description-color,#969799);font-size:var(--action-sheet-description-font-size,14px);line-height:var(--action-sheet-description-line-height,20px);padding:20px var(--padding-md,16px);text-align:center}.van-action-sheet__close{color:var(--action-sheet-close-icon-color,#c8c9cc);font-size:var(--action-sheet-close-icon-size,22px)!important;line-height:inherit!important;padding:var(--action-sheet-close-icon-padding,0 16px);position:absolute!important;right:0;top:0}.van-action-sheet__loading{display:flex!important}

wxcomponents/vant/dist/area/index.d.ts

@@ -0,0 +1 @@
+export {};

wxcomponents/vant/dist/area/index.js

@@ -0,0 +1,220 @@
+import { VantComponent } from '../common/component';
+import { pickerProps } from '../picker/shared';
+import { requestAnimationFrame } from '../common/utils';
+const EMPTY_CODE = '000000';
+VantComponent({
+    classes: ['active-class', 'toolbar-class', 'column-class'],
+    props: Object.assign(Object.assign({}, pickerProps), { showToolbar: {
+            type: Boolean,
+            value: true,
+        }, value: {
+            type: String,
+            observer(value) {
+                this.code = value;
+                this.setValues();
+            },
+        }, areaList: {
+            type: Object,
+            value: {},
+            observer: 'setValues',
+        }, columnsNum: {
+            type: null,
+            value: 3,
+        }, columnsPlaceholder: {
+            type: Array,
+            observer(val) {
+                this.setData({
+                    typeToColumnsPlaceholder: {
+                        province: val[0] || '',
+                        city: val[1] || '',
+                        county: val[2] || '',
+                    },
+                });
+            },
+        } }),
+    data: {
+        columns: [{ values: [] }, { values: [] }, { values: [] }],
+        typeToColumnsPlaceholder: {},
+    },
+    mounted() {
+        requestAnimationFrame(() => {
+            this.setValues();
+        });
+    },
+    methods: {
+        getPicker() {
+            if (this.picker == null) {
+                this.picker = this.selectComponent('.van-area__picker');
+            }
+            return this.picker;
+        },
+        onCancel(event) {
+            this.emit('cancel', event.detail);
+        },
+        onConfirm(event) {
+            const { index } = event.detail;
+            let { value } = event.detail;
+            value = this.parseValues(value);
+            this.emit('confirm', { value, index });
+        },
+        emit(type, detail) {
+            detail.values = detail.value;
+            delete detail.value;
+            this.$emit(type, detail);
+        },
+        parseValues(values) {
+            const { columnsPlaceholder } = this.data;
+            return values.map((value, index) => {
+                if (value &&
+                    (!value.code || value.name === columnsPlaceholder[index])) {
+                    return Object.assign(Object.assign({}, value), { code: '', name: '' });
+                }
+                return value;
+            });
+        },
+        onChange(event) {
+            var _a;
+            const { index, picker, value } = event.detail;
+            this.code = value[index].code;
+            (_a = this.setValues()) === null || _a === void 0 ? void 0 : _a.then(() => {
+                this.$emit('change', {
+                    picker,
+                    values: this.parseValues(picker.getValues()),
+                    index,
+                });
+            });
+        },
+        getConfig(type) {
+            const { areaList } = this.data;
+            return (areaList && areaList[`${type}_list`]) || {};
+        },
+        getList(type, code) {
+            if (type !== 'province' && !code) {
+                return [];
+            }
+            const { typeToColumnsPlaceholder } = this.data;
+            const list = this.getConfig(type);
+            let result = Object.keys(list).map((code) => ({
+                code,
+                name: list[code],
+            }));
+            if (code != null) {
+                // oversea code
+                if (code[0] === '9' && type === 'city') {
+                    code = '9';
+                }
+                result = result.filter((item) => item.code.indexOf(code) === 0);
+            }
+            if (typeToColumnsPlaceholder[type] && result.length) {
+                // set columns placeholder
+                const codeFill = type === 'province'
+                    ? ''
+                    : type === 'city'
+                        ? EMPTY_CODE.slice(2, 4)
+                        : EMPTY_CODE.slice(4, 6);
+                result.unshift({
+                    code: `${code}${codeFill}`,
+                    name: typeToColumnsPlaceholder[type],
+                });
+            }
+            return result;
+        },
+        getIndex(type, code) {
+            let compareNum = type === 'province' ? 2 : type === 'city' ? 4 : 6;
+            const list = this.getList(type, code.slice(0, compareNum - 2));
+            // oversea code
+            if (code[0] === '9' && type === 'province') {
+                compareNum = 1;
+            }
+            code = code.slice(0, compareNum);
+            for (let i = 0; i < list.length; i++) {
+                if (list[i].code.slice(0, compareNum) === code) {
+                    return i;
+                }
+            }
+            return 0;
+        },
+        setValues() {
+            const picker = this.getPicker();
+            if (!picker) {
+                return;
+            }
+            let code = this.code || this.getDefaultCode();
+            const provinceList = this.getList('province');
+            const cityList = this.getList('city', code.slice(0, 2));
+            const stack = [];
+            const indexes = [];
+            const { columnsNum } = this.data;
+            if (columnsNum >= 1) {
+                stack.push(picker.setColumnValues(0, provinceList, false));
+                indexes.push(this.getIndex('province', code));
+            }
+            if (columnsNum >= 2) {
+                stack.push(picker.setColumnValues(1, cityList, false));
+                indexes.push(this.getIndex('city', code));
+                if (cityList.length && code.slice(2, 4) === '00') {
+                    [{ code }] = cityList;
+                }
+            }
+            if (columnsNum === 3) {
+                stack.push(picker.setColumnValues(2, this.getList('county', code.slice(0, 4)), false));
+                indexes.push(this.getIndex('county', code));
+            }
+            return Promise.all(stack)
+                .catch(() => { })
+                .then(() => picker.setIndexes(indexes))
+                .catch(() => { });
+        },
+        getDefaultCode() {
+            const { columnsPlaceholder } = this.data;
+            if (columnsPlaceholder.length) {
+                return EMPTY_CODE;
+            }
+            const countyCodes = Object.keys(this.getConfig('county'));
+            if (countyCodes[0]) {
+                return countyCodes[0];
+            }
+            const cityCodes = Object.keys(this.getConfig('city'));
+            if (cityCodes[0]) {
+                return cityCodes[0];
+            }
+            return '';
+        },
+        getValues() {
+            const picker = this.getPicker();
+            if (!picker) {
+                return [];
+            }
+            return this.parseValues(picker.getValues().filter((value) => !!value));
+        },
+        getDetail() {
+            const values = this.getValues();
+            const area = {
+                code: '',
+                country: '',
+                province: '',
+                city: '',
+                county: '',
+            };
+            if (!values.length) {
+                return area;
+            }
+            const names = values.map((item) => item.name);
+            area.code = values[values.length - 1].code;
+            if (area.code[0] === '9') {
+                area.country = names[1] || '';
+                area.province = names[2] || '';
+            }
+            else {
+                area.province = names[0] || '';
+                area.city = names[1] || '';
+                area.county = names[2] || '';
+            }
+            return area;
+        },
+        reset(code) {
+            this.code = code || '';
+            return this.setValues();
+        },
+    },
+});

wxcomponents/vant/dist/area/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-picker": "../picker/index"
+  }
+}

wxcomponents/vant/dist/area/index.vue

@@ -0,0 +1,234 @@
+<template>
+<uni-shadow-root class="vant-dist-area-index"><van-picker class="van-area__picker" active-class="active-class" toolbar-class="toolbar-class" column-class="column-class" :show-toolbar="showToolbar" value-key="name" :title="title" :loading="loading" :columns="computed.displayColumns(columns, columnsNum)" :item-height="itemHeight" :visible-item-count="visibleItemCount" :cancel-button-text="cancelButtonText" :confirm-button-text="confirmButtonText" @change="onChange" @confirm="onConfirm" @cancel="onCancel"></van-picker></uni-shadow-root>
+</template>
+<wxs src="./index.wxs" module="computed"></wxs>
+<script>
+import VanPicker from '../picker/index.vue'
+global['__wxVueOptions'] = {components:{'van-picker': VanPicker}}
+
+global['__wxRoute'] = 'vant/dist/area/index'
+import { VantComponent } from '../common/component';
+import { pickerProps } from '../picker/shared';
+import { requestAnimationFrame } from '../common/utils';
+const EMPTY_CODE = '000000';
+VantComponent({
+    classes: ['active-class', 'toolbar-class', 'column-class'],
+    props: Object.assign(Object.assign({}, pickerProps), { showToolbar: {
+            type: Boolean,
+            value: true,
+        }, value: {
+            type: String,
+            observer(value) {
+                this.code = value;
+                this.setValues();
+            },
+        }, areaList: {
+            type: Object,
+            value: {},
+            observer: 'setValues',
+        }, columnsNum: {
+            type: null,
+            value: 3,
+        }, columnsPlaceholder: {
+            type: Array,
+            observer(val) {
+                this.setData({
+                    typeToColumnsPlaceholder: {
+                        province: val[0] || '',
+                        city: val[1] || '',
+                        county: val[2] || '',
+                    },
+                });
+            },
+        } }),
+    data: {
+        columns: [{ values: [] }, { values: [] }, { values: [] }],
+        typeToColumnsPlaceholder: {},
+    },
+    mounted() {
+        requestAnimationFrame(() => {
+            this.setValues();
+        });
+    },
+    methods: {
+        getPicker() {
+            if (this.picker == null) {
+                this.picker = this.selectComponent('.van-area__picker');
+            }
+            return this.picker;
+        },
+        onCancel(event) {
+            this.emit('cancel', event.detail);
+        },
+        onConfirm(event) {
+            const { index } = event.detail;
+            let { value } = event.detail;
+            value = this.parseValues(value);
+            this.emit('confirm', { value, index });
+        },
+        emit(type, detail) {
+            detail.values = detail.value;
+            delete detail.value;
+            this.$emit(type, detail);
+        },
+        parseValues(values) {
+            const { columnsPlaceholder } = this.data;
+            return values.map((value, index) => {
+                if (value &&
+                    (!value.code || value.name === columnsPlaceholder[index])) {
+                    return Object.assign(Object.assign({}, value), { code: '', name: '' });
+                }
+                return value;
+            });
+        },
+        onChange(event) {
+            var _a;
+            const { index, picker, value } = event.detail;
+            this.code = value[index].code;
+            (_a = this.setValues()) === null || _a === void 0 ? void 0 : _a.then(() => {
+                this.$emit('change', {
+                    picker,
+                    values: this.parseValues(picker.getValues()),
+                    index,
+                });
+            });
+        },
+        getConfig(type) {
+            const { areaList } = this.data;
+            return (areaList && areaList[`${type}_list`]) || {};
+        },
+        getList(type, code) {
+            if (type !== 'province' && !code) {
+                return [];
+            }
+            const { typeToColumnsPlaceholder } = this.data;
+            const list = this.getConfig(type);
+            let result = Object.keys(list).map((code) => ({
+                code,
+                name: list[code],
+            }));
+            if (code != null) {
+                // oversea code
+                if (code[0] === '9' && type === 'city') {
+                    code = '9';
+                }
+                result = result.filter((item) => item.code.indexOf(code) === 0);
+            }
+            if (typeToColumnsPlaceholder[type] && result.length) {
+                // set columns placeholder
+                const codeFill = type === 'province'
+                    ? ''
+                    : type === 'city'
+                        ? EMPTY_CODE.slice(2, 4)
+                        : EMPTY_CODE.slice(4, 6);
+                result.unshift({
+                    code: `${code}${codeFill}`,
+                    name: typeToColumnsPlaceholder[type],
+                });
+            }
+            return result;
+        },
+        getIndex(type, code) {
+            let compareNum = type === 'province' ? 2 : type === 'city' ? 4 : 6;
+            const list = this.getList(type, code.slice(0, compareNum - 2));
+            // oversea code
+            if (code[0] === '9' && type === 'province') {
+                compareNum = 1;
+            }
+            code = code.slice(0, compareNum);
+            for (let i = 0; i < list.length; i++) {
+                if (list[i].code.slice(0, compareNum) === code) {
+                    return i;
+                }
+            }
+            return 0;
+        },
+        setValues() {
+            const picker = this.getPicker();
+            if (!picker) {
+                return;
+            }
+            let code = this.code || this.getDefaultCode();
+            const provinceList = this.getList('province');
+            const cityList = this.getList('city', code.slice(0, 2));
+            const stack = [];
+            const indexes = [];
+            const { columnsNum } = this.data;
+            if (columnsNum >= 1) {
+                stack.push(picker.setColumnValues(0, provinceList, false));
+                indexes.push(this.getIndex('province', code));
+            }
+            if (columnsNum >= 2) {
+                stack.push(picker.setColumnValues(1, cityList, false));
+                indexes.push(this.getIndex('city', code));
+                if (cityList.length && code.slice(2, 4) === '00') {
+                    [{ code }] = cityList;
+                }
+            }
+            if (columnsNum === 3) {
+                stack.push(picker.setColumnValues(2, this.getList('county', code.slice(0, 4)), false));
+                indexes.push(this.getIndex('county', code));
+            }
+            return Promise.all(stack)
+                .catch(() => { })
+                .then(() => picker.setIndexes(indexes))
+                .catch(() => { });
+        },
+        getDefaultCode() {
+            const { columnsPlaceholder } = this.data;
+            if (columnsPlaceholder.length) {
+                return EMPTY_CODE;
+            }
+            const countyCodes = Object.keys(this.getConfig('county'));
+            if (countyCodes[0]) {
+                return countyCodes[0];
+            }
+            const cityCodes = Object.keys(this.getConfig('city'));
+            if (cityCodes[0]) {
+                return cityCodes[0];
+            }
+            return '';
+        },
+        getValues() {
+            const picker = this.getPicker();
+            if (!picker) {
+                return [];
+            }
+            return this.parseValues(picker.getValues().filter((value) => !!value));
+        },
+        getDetail() {
+            const values = this.getValues();
+            const area = {
+                code: '',
+                country: '',
+                province: '',
+                city: '',
+                county: '',
+            };
+            if (!values.length) {
+                return area;
+            }
+            const names = values.map((item) => item.name);
+            area.code = values[values.length - 1].code;
+            if (area.code[0] === '9') {
+                area.country = names[1] || '';
+                area.province = names[2] || '';
+            }
+            else {
+                area.province = names[0] || '';
+                area.city = names[1] || '';
+                area.county = names[2] || '';
+            }
+            return area;
+        },
+        reset(code) {
+            this.code = code || '';
+            return this.setValues();
+        },
+    },
+});
+export default global['__wxComponents']['vant/dist/area/index']
+</script>
+<style platform="mp-weixin">
+@import '../common/index.css';
+</style>

wxcomponents/vant/dist/area/index.wxml

@@ -0,0 +1,20 @@
+<wxs src="./index.wxs" module="computed" />
+
+<van-picker
+  class="van-area__picker"
+  active-class="active-class"
+  toolbar-class="toolbar-class"
+  column-class="column-class"
+  show-toolbar="{{ showToolbar }}"
+  value-key="name"
+  title="{{ title }}"
+  loading="{{ loading }}"
+  columns="{{ computed.displayColumns(columns, columnsNum) }}"
+  item-height="{{ itemHeight }}"
+  visible-item-count="{{ visibleItemCount }}"
+  cancel-button-text="{{ cancelButtonText }}"
+  confirm-button-text="{{ confirmButtonText }}"
+  bind:change="onChange"
+  bind:confirm="onConfirm"
+  bind:cancel="onCancel"
+/>

wxcomponents/vant/dist/area/index.wxs

@@ -0,0 +1,8 @@
+/* eslint-disable */
+function displayColumns(columns, columnsNum) {
+  return columns.slice(0, +columnsNum);
+}
+
+module.exports = {
+  displayColumns: displayColumns,
+};

wxcomponents/vant/dist/area/index.wxss

@@ -0,0 +1 @@
+@import '../common/index.wxss';

wxcomponents/vant/dist/button/index.d.ts

@@ -0,0 +1 @@
+export {};

wxcomponents/vant/dist/button/index.js

@@ -0,0 +1,64 @@
+import { VantComponent } from '../common/component';
+import { button } from '../mixins/button';
+import { canIUseFormFieldButton } from '../common/version';
+const mixins = [button];
+if (canIUseFormFieldButton()) {
+    mixins.push('wx://form-field-button');
+}
+VantComponent({
+    mixins,
+    classes: ['hover-class', 'loading-class'],
+    data: {
+        baseStyle: '',
+    },
+    props: {
+        formType: String,
+        icon: String,
+        classPrefix: {
+            type: String,
+            value: 'van-icon',
+        },
+        plain: Boolean,
+        block: Boolean,
+        round: Boolean,
+        square: Boolean,
+        loading: Boolean,
+        hairline: Boolean,
+        disabled: Boolean,
+        loadingText: String,
+        customStyle: String,
+        loadingType: {
+            type: String,
+            value: 'circular',
+        },
+        type: {
+            type: String,
+            value: 'default',
+        },
+        dataset: null,
+        size: {
+            type: String,
+            value: 'normal',
+        },
+        loadingSize: {
+            type: String,
+            value: '20px',
+        },
+        color: String,
+    },
+    methods: {
+        onClick(event) {
+            this.$emit('click', event);
+            const { canIUseGetUserProfile, openType, getUserProfileDesc, lang, } = this.data;
+            if (openType === 'getUserInfo' && canIUseGetUserProfile) {
+                wx.getUserProfile({
+                    desc: getUserProfileDesc || '  ',
+                    lang: lang || 'en',
+                    complete: (userProfile) => {
+                        this.$emit('getuserinfo', userProfile);
+                    },
+                });
+            }
+        },
+    },
+});

wxcomponents/vant/dist/button/index.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-loading": "../loading/index"
+  }
+}

wxcomponents/vant/dist/button/index.vue

@@ -0,0 +1,92 @@
+<template>
+<uni-shadow-root class="vant-dist-button-index"><button :id="id" :data-detail="dataset" :class="'custom-class '+(utils.bem('button', [type, size, { block, round, plain, square, loading, disabled, hairline, unclickable: disabled || loading }]))+' '+(hairline ? 'van-hairline--surround' : '')" :hover-class="disabled || loading ? '' : 'van-button--active hover-class'" :lang="lang" :form-type="formType" :style="computed.rootStyle({ plain, color, customStyle })" :open-type="disabled || loading || (canIUseGetUserProfile && openType === 'getUserInfo') ? '' : openType" :business-id="businessId" :session-from="sessionFrom" :send-message-title="sendMessageTitle" :send-message-path="sendMessagePath" :send-message-img="sendMessageImg" :show-message-card="showMessageCard" :app-parameter="appParameter" :aria-label="ariaLabel" @click="_$self[(disabled || loading ? '' : 'onClick')||'_$noop']($event)" @getuserinfo="onGetUserInfo" @contact="onContact" @getphonenumber="onGetPhoneNumber" @error="onError" @launchapp="onLaunchApp" @opensetting="onOpenSetting" @chooseavatar="onChooseAvatar">
+  <block v-if="loading">
+    <van-loading custom-class="loading-class" :size="loadingSize" :type="loadingType" :color="computed.loadingColor({ type, color, plain })"></van-loading>
+    <view v-if="loadingText" class="van-button__loading-text">
+      {{ loadingText }}
+    </view>
+  </block>
+  <block v-else>
+    <van-icon v-if="icon" size="1.2em" :name="icon" :class-prefix="classPrefix" class="van-button__icon" custom-style="line-height: inherit;"></van-icon>
+    <view class="van-button__text">
+      <slot></slot>
+    </view>
+  </block>
+</button></uni-shadow-root>
+</template>
+<wxs src="../wxs/utils.wxs" module="utils"></wxs><wxs src="./index.wxs" module="computed"></wxs>
+<script>
+import VanIcon from '../icon/index.vue'
+import VanLoading from '../loading/index.vue'
+global['__wxVueOptions'] = {components:{'van-icon': VanIcon,'van-loading': VanLoading}}
+
+global['__wxRoute'] = 'vant/dist/button/index'
+import { VantComponent } from '../common/component';
+import { button } from '../mixins/button';
+import { canIUseFormFieldButton } from '../common/version';
+const mixins = [button];
+if (canIUseFormFieldButton()) {
+    mixins.push('wx://form-field-button');
+}
+VantComponent({
+    mixins,
+    classes: ['hover-class', 'loading-class'],
+    data: {
+        baseStyle: '',
+    },
+    props: {
+        formType: String,
+        icon: String,
+        classPrefix: {
+            type: String,
+            value: 'van-icon',
+        },
+        plain: Boolean,
+        block: Boolean,
+        round: Boolean,
+        square: Boolean,
+        loading: Boolean,
+        hairline: Boolean,
+        disabled: Boolean,
+        loadingText: String,
+        customStyle: String,
+        loadingType: {
+            type: String,
+            value: 'circular',
+        },
+        type: {
+            type: String,
+            value: 'default',
+        },
+        dataset: null,
+        size: {
+            type: String,
+            value: 'normal',
+        },
+        loadingSize: {
+            type: String,
+            value: '20px',
+        },
+        color: String,
+    },
+    methods: {
+        onClick(event) {
+            this.$emit('click', event);
+            const { canIUseGetUserProfile, openType, getUserProfileDesc, lang, } = this.data;
+            if (openType === 'getUserInfo' && canIUseGetUserProfile) {
+                wx.getUserProfile({
+                    desc: getUserProfileDesc || '  ',
+                    lang: lang || 'en',
+                    complete: (userProfile) => {
+                        this.$emit('getuserinfo', userProfile);
+                    },
+                });
+            }
+        },
+    },
+});
+export default global['__wxComponents']['vant/dist/button/index']
+</script>
+<style platform="mp-weixin">
+@import '../common/index.css';.van-button{-webkit-text-size-adjust:100%;align-items:center;-webkit-appearance:none;border-radius:var(--button-border-radius,2px);box-sizing:border-box;display:inline-flex;font-size:var(--button-default-font-size,16px);height:var(--button-default-height,44px);justify-content:center;line-height:var(--button-line-height,20px);padding:0;position:relative;text-align:center;transition:opacity .2s;vertical-align:middle}.van-button:before{background-color:#000;border:inherit;border-color:#000;border-radius:inherit;content:" ";height:100%;left:50%;opacity:0;position:absolute;top:50%;transform:translate(-50%,-50%);width:100%}.van-button:after{border-width:0}.van-button--active:before{opacity:.15}.van-button--unclickable:after{display:none}.van-button--default{background:var(--button-default-background-color,#fff);border:var(--button-border-width,1px) solid var(--button-default-border-color,#ebedf0);color:var(--button-default-color,#323233)}.van-button--primary{background:var(--button-primary-background-color,#07c160);border:var(--button-border-width,1px) solid var(--button-primary-border-color,#07c160);color:var(--button-primary-color,#fff)}.van-button--info{background:var(--button-info-background-color,#1989fa);border:var(--button-border-width,1px) solid var(--button-info-border-color,#1989fa);color:var(--button-info-color,#fff)}.van-button--danger{background:var(--button-danger-background-color,#ee0a24);border:var(--button-border-width,1px) solid var(--button-danger-border-color,#ee0a24);color:var(--button-danger-color,#fff)}.van-button--warning{background:var(--button-warning-background-color,#ff976a);border:var(--button-border-width,1px) solid var(--button-warning-border-color,#ff976a);color:var(--button-warning-color,#fff)}.van-button--plain{background:var(--button-plain-background-color,#fff)}.van-button--plain.van-button--primary{color:var(--button-primary-background-color,#07c160)}.van-button--plain.van-button--info{color:var(--button-info-background-color,#1989fa)}.van-button--plain.van-button--danger{color:var(--button-danger-background-color,#ee0a24)}.van-button--plain.van-button--warning{color:var(--button-warning-background-color,#ff976a)}.van-button--large{height:var(--button-large-height,50px);width:100%}.van-button--normal{font-size:var(--button-normal-font-size,14px);padding:0 15px}.van-button--small{font-size:var(--button-small-font-size,12px);height:var(--button-small-height,30px);min-width:var(--button-small-min-width,60px);padding:0 var(--padding-xs,8px)}.van-button--mini{display:inline-block;font-size:var(--button-mini-font-size,10px);height:var(--button-mini-height,22px);min-width:var(--button-mini-min-width,50px)}.van-button--mini+.van-button--mini{margin-left:5px}.van-button--block{display:flex;width:100%}.van-button--round{border-radius:var(--button-round-border-radius,999px)}.van-button--square{border-radius:0}.van-button--disabled{opacity:var(--button-disabled-opacity,.5)}.van-button__text{display:inline}.van-button__icon+.van-button__text:not(:empty),.van-button__loading-text{margin-left:4px}.van-button__icon{line-height:inherit!important;min-width:1em;vertical-align:top}.van-button--hairline{border-width:0;padding-top:1px}.van-button--hairline:after{border-color:inherit;border-radius:calc(var(--button-border-radius, 2px)*2);border-width:1px}.van-button--hairline.van-button--round:after{border-radius:var(--button-round-border-radius,999px)}.van-button--hairline.van-button--square:after{border-radius:0}
+</style>

wxcomponents/vant/dist/button/index.wxml

@@ -0,0 +1,54 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="computed" />
+
+<button
+  id="{{ id }}"
+  data-detail="{{ dataset }}"
+  class="custom-class {{ utils.bem('button', [type, size, { block, round, plain, square, loading, disabled, hairline, unclickable: disabled || loading }]) }} {{ hairline ? 'van-hairline--surround' : '' }}"
+  hover-class="{{ disabled || loading ? '' : 'van-button--active hover-class'}}"
+  lang="{{ lang }}"
+  form-type="{{ formType }}"
+  style="{{ computed.rootStyle({ plain, color, customStyle }) }}"
+  open-type="{{ disabled || loading || (canIUseGetUserProfile && openType === 'getUserInfo') ? '' : openType }}"
+  business-id="{{ businessId }}"
+  session-from="{{ sessionFrom }}"
+  send-message-title="{{ sendMessageTitle }}"
+  send-message-path="{{ sendMessagePath }}"
+  send-message-img="{{ sendMessageImg }}"
+  show-message-card="{{ showMessageCard }}"
+  app-parameter="{{ appParameter }}"
+  aria-label="{{ ariaLabel }}"
+  bindtap="{{ disabled || loading ? '' : 'onClick' }}"
+  bindgetuserinfo="onGetUserInfo"
+  bindcontact="onContact"
+  bindgetphonenumber="onGetPhoneNumber"
+  binderror="onError"
+  bindlaunchapp="onLaunchApp"
+  bindopensetting="onOpenSetting"
+  bindchooseavatar="onChooseAvatar"
+>
+  <block wx:if="{{ loading }}">
+    <van-loading
+      custom-class="loading-class"
+      size="{{ loadingSize }}"
+      type="{{ loadingType }}"
+      color="{{ computed.loadingColor({ type, color, plain }) }}"
+    />
+    <view wx:if="{{ loadingText }}" class="van-button__loading-text">
+      {{ loadingText }}
+    </view>
+  </block>
+  <block wx:else>
+    <van-icon
+      wx:if="{{ icon }}"
+      size="1.2em"
+      name="{{ icon }}"
+      class-prefix="{{ classPrefix }}"
+      class="van-button__icon"
+      custom-style="line-height: inherit;"
+    />
+    <view class="van-button__text">
+      <slot />
+    </view>
+  </block>
+</button>

wxcomponents/vant/dist/button/index.wxs

@@ -0,0 +1,39 @@
+/* eslint-disable */
+var style = require('../wxs/style.wxs');
+
+function rootStyle(data) {
+  if (!data.color) {
+    return data.customStyle;
+  }
+
+  var properties = {
+    color: data.plain ? data.color : '#fff',
+    background: data.plain ? null : data.color,
+  };
+
+  // hide border when color is linear-gradient
+  if (data.color.indexOf('gradient') !== -1) {
+    properties.border = 0;
+  } else {
+    properties['border-color'] = data.color;
+  }
+
+  return style([properties, data.customStyle]);
+}
+
+function loadingColor(data) {
+  if (data.plain) {
+    return data.color ? data.color : '#c9c9c9';
+  }
+
+  if (data.type === 'default') {
+    return '#c9c9c9';
+  }
+
+  return '#fff';
+}
+
+module.exports = {
+  rootStyle: rootStyle,
+  loadingColor: loadingColor,
+};

wxcomponents/vant/dist/button/index.wxss

@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-button{-webkit-text-size-adjust:100%;align-items:center;-webkit-appearance:none;border-radius:var(--button-border-radius,2px);box-sizing:border-box;display:inline-flex;font-size:var(--button-default-font-size,16px);height:var(--button-default-height,44px);justify-content:center;line-height:var(--button-line-height,20px);padding:0;position:relative;text-align:center;transition:opacity .2s;vertical-align:middle}.van-button:before{background-color:#000;border:inherit;border-color:#000;border-radius:inherit;content:" ";height:100%;left:50%;opacity:0;position:absolute;top:50%;transform:translate(-50%,-50%);width:100%}.van-button:after{border-width:0}.van-button--active:before{opacity:.15}.van-button--unclickable:after{display:none}.van-button--default{background:var(--button-default-background-color,#fff);border:var(--button-border-width,1px) solid var(--button-default-border-color,#ebedf0);color:var(--button-default-color,#323233)}.van-button--primary{background:var(--button-primary-background-color,#07c160);border:var(--button-border-width,1px) solid var(--button-primary-border-color,#07c160);color:var(--button-primary-color,#fff)}.van-button--info{background:var(--button-info-background-color,#1989fa);border:var(--button-border-width,1px) solid var(--button-info-border-color,#1989fa);color:var(--button-info-color,#fff)}.van-button--danger{background:var(--button-danger-background-color,#ee0a24);border:var(--button-border-width,1px) solid var(--button-danger-border-color,#ee0a24);color:var(--button-danger-color,#fff)}.van-button--warning{background:var(--button-warning-background-color,#ff976a);border:var(--button-border-width,1px) solid var(--button-warning-border-color,#ff976a);color:var(--button-warning-color,#fff)}.van-button--plain{background:var(--button-plain-background-color,#fff)}.van-button--plain.van-button--primary{color:var(--button-primary-background-color,#07c160)}.van-button--plain.van-button--info{color:var(--button-info-background-color,#1989fa)}.van-button--plain.van-button--danger{color:var(--button-danger-background-color,#ee0a24)}.van-button--plain.van-button--warning{color:var(--button-warning-background-color,#ff976a)}.van-button--large{height:var(--button-large-height,50px);width:100%}.van-button--normal{font-size:var(--button-normal-font-size,14px);padding:0 15px}.van-button--small{font-size:var(--button-small-font-size,12px);height:var(--button-small-height,30px);min-width:var(--button-small-min-width,60px);padding:0 var(--padding-xs,8px)}.van-button--mini{display:inline-block;font-size:var(--button-mini-font-size,10px);height:var(--button-mini-height,22px);min-width:var(--button-mini-min-width,50px)}.van-button--mini+.van-button--mini{margin-left:5px}.van-button--block{display:flex;width:100%}.van-button--round{border-radius:var(--button-round-border-radius,999px)}.van-button--square{border-radius:0}.van-button--disabled{opacity:var(--button-disabled-opacity,.5)}.van-button__text{display:inline}.van-button__icon+.van-button__text:not(:empty),.van-button__loading-text{margin-left:4px}.van-button__icon{line-height:inherit!important;min-width:1em;vertical-align:top}.van-button--hairline{border-width:0;padding-top:1px}.van-button--hairline:after{border-color:inherit;border-radius:calc(var(--button-border-radius, 2px)*2);border-width:1px}.van-button--hairline.van-button--round:after{border-radius:var(--button-round-border-radius,999px)}.van-button--hairline.van-button--square:after{border-radius:0}

wxcomponents/vant/dist/calendar/calendar.vue

@@ -0,0 +1,37 @@
+<template>
+<uni-shadow-root class="vant-dist-calendar-calendar"><view class="van-calendar">
+  <header :title="title" :showTitle="showTitle" :subtitle="subtitle" :showSubtitle="showSubtitle" :firstDayOfWeek="firstDayOfWeek" @click-subtitle="onClickSubtitle">
+    <slot name="title" slot="title"></slot>
+  </header>
+
+  <scroll-view class="van-calendar__body" scroll-y :scroll-into-view="scrollIntoView">
+    <month v-for="(item,index) in (computed.getMonths(minDate, maxDate))" :key="item.index" :id="'month'+(index)" class="month" :data-date="item" :date="item" :type="type" :color="color" :minDate="minDate" :maxDate="maxDate" :showMark="showMark" :formatter="formatter" :rowHeight="rowHeight" :currentDate="currentDate" :showSubtitle="showSubtitle" :allowSameDay="allowSameDay" :showMonthTitle="index !== 0 || !showSubtitle" :firstDayOfWeek="firstDayOfWeek" @click="onClickDay"></month>
+  </scroll-view>
+
+  <view :class="utils.bem('calendar__footer', { safeAreaInsetBottom })">
+    <slot name="footer"></slot>
+  </view>
+
+  <view :class="utils.bem('calendar__footer', { safeAreaInsetBottom })">
+    <van-button v-if="showConfirm" round block type="danger" :color="color" custom-class="van-calendar__confirm" :disabled="computed.getButtonDisabled(type, currentDate, minRange)" nativeType="text" @click="onConfirm">
+      {{
+        computed.getButtonDisabled(type, currentDate, minRange)
+          ? confirmDisabledText
+          : confirmText
+      }}
+    </van-button>
+  </view>
+</view></uni-shadow-root>
+</template>
+
+<script>
+
+global['__wxRoute'] = 'vant/dist/calendar/calendar'
+
+Component({})
+
+export default global['__wxComponents']['vant/dist/calendar/calendar']
+</script>
+<style platform="mp-weixin">
+
+</style>

wxcomponents/vant/dist/calendar/calendar.wxml

@@ -0,0 +1,68 @@
+<view class="van-calendar">
+  <header
+    title="{{ title }}"
+    showTitle="{{ showTitle }}"
+    subtitle="{{ subtitle }}"
+    showSubtitle="{{ showSubtitle }}"
+    firstDayOfWeek="{{ firstDayOfWeek }}"
+    bind:click-subtitle="onClickSubtitle"
+  >
+    <slot name="title" slot="title"></slot>
+  </header>
+
+  <scroll-view
+    class="van-calendar__body"
+    scroll-y
+    scroll-into-view="{{ scrollIntoView }}"
+  >
+    <month
+      wx:for="{{ computed.getMonths(minDate, maxDate) }}"
+      wx:key="index"
+      id="month{{ index }}"
+      class="month"
+      data-date="{{ item }}"
+      date="{{ item }}"
+      type="{{ type }}"
+      color="{{ color }}"
+      minDate="{{ minDate }}"
+      maxDate="{{ maxDate }}"
+      showMark="{{ showMark }}"
+      formatter="{{ formatter }}"
+      rowHeight="{{ rowHeight }}"
+      currentDate="{{ currentDate }}"
+      showSubtitle="{{ showSubtitle }}"
+      allowSameDay="{{ allowSameDay }}"
+      showMonthTitle="{{ index !== 0 || !showSubtitle }}"
+      firstDayOfWeek="{{ firstDayOfWeek }}"
+      bind:click="onClickDay"
+    />
+  </scroll-view>
+
+  <view
+    class="{{ utils.bem('calendar__footer', { safeAreaInsetBottom }) }}"
+  >
+    <slot name="footer"></slot>
+  </view>
+
+  <view
+    class="{{ utils.bem('calendar__footer', { safeAreaInsetBottom }) }}"
+  >
+    <van-button
+      wx:if="{{ showConfirm }}"
+      round
+      block
+      type="danger"
+      color="{{ color }}"
+      custom-class="van-calendar__confirm"
+      disabled="{{ computed.getButtonDisabled(type, currentDate, minRange) }}"
+      nativeType="text"
+      bind:click="onConfirm"
+    >
+      {{
+        computed.getButtonDisabled(type, currentDate, minRange)
+          ? confirmDisabledText
+          : confirmText
+      }}
+    </van-button>
+  </view>
+</view>

wxcomponents/vant/dist/calendar/components/header/index.d.ts

@@ -0,0 +1 @@
+export {};

wxcomponents/vant/dist/calendar/components/header/index.js

@@ -0,0 +1,37 @@
+import { VantComponent } from '../../../common/component';
+VantComponent({
+    props: {
+        title: {
+            type: String,
+            value: '日期选择',
+        },
+        subtitle: String,
+        showTitle: Boolean,
+        showSubtitle: Boolean,
+        firstDayOfWeek: {
+            type: Number,
+            observer: 'initWeekDay',
+        },
+    },
+    data: {
+        weekdays: [],
+    },
+    created() {
+        this.initWeekDay();
+    },
+    methods: {
+        initWeekDay() {
+            const defaultWeeks = ['日', '一', '二', '三', '四', '五', '六'];
+            const firstDayOfWeek = this.data.firstDayOfWeek || 0;
+            this.setData({
+                weekdays: [
+                    ...defaultWeeks.slice(firstDayOfWeek, 7),
+                    ...defaultWeeks.slice(0, firstDayOfWeek),
+                ],
+            });
+        },
+        onClickSubtitle(event) {
+            this.$emit('click-subtitle', event);
+        },
+    },
+});

wxcomponents/vant/dist/calendar/components/header/index.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

wxcomponents/vant/dist/calendar/components/header/index.vue

@@ -0,0 +1,64 @@
+<template>
+<uni-shadow-root class="vant-dist-calendar-components-header-index"><view class="van-calendar__header">
+  <block v-if="showTitle">
+    <view class="van-calendar__header-title"><slot name="title"></slot></view>
+    <view class="van-calendar__header-title">{{ title }}</view>
+  </block>
+
+  <view v-if="showSubtitle" class="van-calendar__header-subtitle" @click="onClickSubtitle">
+    {{ subtitle }}
+  </view>
+
+  <view class="van-calendar__weekdays">
+    <view v-for="(item,index) in (weekdays)" :key="item.index" class="van-calendar__weekday">
+      {{ item }}
+    </view>
+  </view>
+</view></uni-shadow-root>
+</template>
+
+<script>
+
+global['__wxRoute'] = 'vant/dist/calendar/components/header/index'
+import { VantComponent } from '../../../common/component';
+VantComponent({
+    props: {
+        title: {
+            type: String,
+            value: '日期选择',
+        },
+        subtitle: String,
+        showTitle: Boolean,
+        showSubtitle: Boolean,
+        firstDayOfWeek: {
+            type: Number,
+            observer: 'initWeekDay',
+        },
+    },
+    data: {
+        weekdays: [],
+    },
+    created() {
+        this.initWeekDay();
+    },
+    methods: {
+        initWeekDay() {
+            const defaultWeeks = ['日', '一', '二', '三', '四', '五', '六'];
+            const firstDayOfWeek = this.data.firstDayOfWeek || 0;
+            this.setData({
+                weekdays: [
+                    ...defaultWeeks.slice(firstDayOfWeek, 7),
+                    ...defaultWeeks.slice(0, firstDayOfWeek),
+                ],
+            });
+        },
+        onClickSubtitle(event) {
+            this.$emit('click-subtitle', event);
+        },
+    },
+});
+export default global['__wxComponents']['vant/dist/calendar/components/header/index']
+</script>
+<style platform="mp-weixin">
+@import '../../../common/index.css';.van-calendar__header{box-shadow:var(--calendar-header-box-shadow,0 2px 10px hsla(220,1%,50%,.16));flex-shrink:0}.van-calendar__header-subtitle,.van-calendar__header-title{font-weight:var(--font-weight-bold,500);height:var(--calendar-header-title-height,44px);line-height:var(--calendar-header-title-height,44px);text-align:center}.van-calendar__header-title+.van-calendar__header-title,.van-calendar__header-title:empty{display:none}.van-calendar__header-title:empty+.van-calendar__header-title{display:block!important}.van-calendar__weekdays{display:flex}.van-calendar__weekday{flex:1;font-size:var(--calendar-weekdays-font-size,12px);line-height:var(--calendar-weekdays-height,30px);text-align:center}
+</style>

wxcomponents/vant/dist/calendar/components/header/index.wxml

@@ -0,0 +1,16 @@
+<view class="van-calendar__header">
+  <block wx:if="{{ showTitle }}">
+    <view class="van-calendar__header-title"><slot name="title"></slot></view>
+    <view class="van-calendar__header-title">{{ title }}</view>
+  </block>
+
+  <view wx:if="{{ showSubtitle }}" class="van-calendar__header-subtitle" bind:tap="onClickSubtitle">
+    {{ subtitle }}
+  </view>
+
+  <view class="van-calendar__weekdays">
+    <view wx:for="{{ weekdays }}" wx:key="index" class="van-calendar__weekday">
+      {{ item }}
+    </view>
+  </view>
+</view>

wxcomponents/vant/dist/calendar/components/header/index.wxss

@@ -0,0 +1 @@
+@import '../../../common/index.wxss';.van-calendar__header{box-shadow:var(--calendar-header-box-shadow,0 2px 10px hsla(220,1%,50%,.16));flex-shrink:0}.van-calendar__header-subtitle,.van-calendar__header-title{font-weight:var(--font-weight-bold,500);height:var(--calendar-header-title-height,44px);line-height:var(--calendar-header-title-height,44px);text-align:center}.van-calendar__header-title+.van-calendar__header-title,.van-calendar__header-title:empty{display:none}.van-calendar__header-title:empty+.van-calendar__header-title{display:block!important}.van-calendar__weekdays{display:flex}.van-calendar__weekday{flex:1;font-size:var(--calendar-weekdays-font-size,12px);line-height:var(--calendar-weekdays-height,30px);text-align:center}

wxcomponents/vant/dist/calendar/components/month/index.d.ts

@@ -0,0 +1,6 @@
+export interface Day {
+    date: Date;
+    type: string;
+    text: number;
+    bottomInfo?: string;
+}

wxcomponents/vant/dist/calendar/components/month/index.js

@@ -0,0 +1,154 @@
+import { VantComponent } from '../../../common/component';
+import { getMonthEndDay, compareDay, getPrevDay, getNextDay, } from '../../utils';
+VantComponent({
+    props: {
+        date: {
+            type: null,
+            observer: 'setDays',
+        },
+        type: {
+            type: String,
+            observer: 'setDays',
+        },
+        color: String,
+        minDate: {
+            type: null,
+            observer: 'setDays',
+        },
+        maxDate: {
+            type: null,
+            observer: 'setDays',
+        },
+        showMark: Boolean,
+        rowHeight: null,
+        formatter: {
+            type: null,
+            observer: 'setDays',
+        },
+        currentDate: {
+            type: null,
+            observer: 'setDays',
+        },
+        firstDayOfWeek: {
+            type: Number,
+            observer: 'setDays',
+        },
+        allowSameDay: Boolean,
+        showSubtitle: Boolean,
+        showMonthTitle: Boolean,
+    },
+    data: {
+        visible: true,
+        days: [],
+    },
+    methods: {
+        onClick(event) {
+            const { index } = event.currentTarget.dataset;
+            const item = this.data.days[index];
+            if (item.type !== 'disabled') {
+                this.$emit('click', item);
+            }
+        },
+        setDays() {
+            const days = [];
+            const startDate = new Date(this.data.date);
+            const year = startDate.getFullYear();
+            const month = startDate.getMonth();
+            const totalDay = getMonthEndDay(startDate.getFullYear(), startDate.getMonth() + 1);
+            for (let day = 1; day <= totalDay; day++) {
+                const date = new Date(year, month, day);
+                const type = this.getDayType(date);
+                let config = {
+                    date,
+                    type,
+                    text: day,
+                    bottomInfo: this.getBottomInfo(type),
+                };
+                if (this.data.formatter) {
+                    config = this.data.formatter(config);
+                }
+                days.push(config);
+            }
+            this.setData({ days });
+        },
+        getMultipleDayType(day) {
+            const { currentDate } = this.data;
+            if (!Array.isArray(currentDate)) {
+                return '';
+            }
+            const isSelected = (date) => currentDate.some((item) => compareDay(item, date) === 0);
+            if (isSelected(day)) {
+                const prevDay = getPrevDay(day);
+                const nextDay = getNextDay(day);
+                const prevSelected = isSelected(prevDay);
+                const nextSelected = isSelected(nextDay);
+                if (prevSelected && nextSelected) {
+                    return 'multiple-middle';
+                }
+                if (prevSelected) {
+                    return 'end';
+                }
+                return nextSelected ? 'start' : 'multiple-selected';
+            }
+            return '';
+        },
+        getRangeDayType(day) {
+            const { currentDate, allowSameDay } = this.data;
+            if (!Array.isArray(currentDate)) {
+                return '';
+            }
+            const [startDay, endDay] = currentDate;
+            if (!startDay) {
+                return '';
+            }
+            const compareToStart = compareDay(day, startDay);
+            if (!endDay) {
+                return compareToStart === 0 ? 'start' : '';
+            }
+            const compareToEnd = compareDay(day, endDay);
+            if (compareToStart === 0 && compareToEnd === 0 && allowSameDay) {
+                return 'start-end';
+            }
+            if (compareToStart === 0) {
+                return 'start';
+            }
+            if (compareToEnd === 0) {
+                return 'end';
+            }
+            if (compareToStart > 0 && compareToEnd < 0) {
+                return 'middle';
+            }
+            return '';
+        },
+        getDayType(day) {
+            const { type, minDate, maxDate, currentDate } = this.data;
+            if (compareDay(day, minDate) < 0 || compareDay(day, maxDate) > 0) {
+                return 'disabled';
+            }
+            if (type === 'single') {
+                return compareDay(day, currentDate) === 0 ? 'selected' : '';
+            }
+            if (type === 'multiple') {
+                return this.getMultipleDayType(day);
+            }
+            /* istanbul ignore else */
+            if (type === 'range') {
+                return this.getRangeDayType(day);
+            }
+            return '';
+        },
+        getBottomInfo(type) {
+            if (this.data.type === 'range') {
+                if (type === 'start') {
+                    return '开始';
+                }
+                if (type === 'end') {
+                    return '结束';
+                }
+                if (type === 'start-end') {
+                    return '开始/结束';
+                }
+            }
+        },
+    },
+});

wxcomponents/vant/dist/calendar/components/month/index.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

wxcomponents/vant/dist/calendar/components/month/index.vue

@@ -0,0 +1,194 @@
+<template>
+<uni-shadow-root class="vant-dist-calendar-components-month-index"><view class="van-calendar__month" :style="computed.getMonthStyle(visible, date, rowHeight)">
+  <view v-if="showMonthTitle" class="van-calendar__month-title">
+    {{ computed.formatMonthTitle(date) }}
+  </view>
+
+  <view v-if="visible" class="van-calendar__days">
+    <view v-if="showMark" class="van-calendar__month-mark">
+      {{ computed.getMark(date) }}
+    </view>
+
+    <view v-for="(item,index) in (days)" :key="item.index" :style="computed.getDayStyle(item.type, index, date, rowHeight, color, firstDayOfWeek)" :class="(utils.bem('calendar__day', [item.type]))+' '+(item.className)" :data-index="index" @click="onClick">
+      <view v-if="item.type === 'selected'" class="van-calendar__selected-day" :style="'width: '+(rowHeight)+'px; height: '+(rowHeight)+'px; background: '+(color)">
+        <view v-if="item.topInfo" class="van-calendar__top-info">{{ item.topInfo }}</view>
+        {{ item.text }}
+        <view v-if="item.bottomInfo" class="van-calendar__bottom-info">
+          {{ item.bottomInfo }}
+        </view>
+      </view>
+
+      <view v-else>
+        <view v-if="item.topInfo" class="van-calendar__top-info">{{ item.topInfo }}</view>
+        {{ item.text }}
+        <view v-if="item.bottomInfo" class="van-calendar__bottom-info">
+          {{ item.bottomInfo }}
+        </view>
+      </view>
+    </view>
+  </view>
+</view></uni-shadow-root>
+</template>
+<wxs src="./index.wxs" module="computed"></wxs><wxs src="../../../wxs/utils.wxs" module="utils"></wxs>
+<script>
+
+global['__wxRoute'] = 'vant/dist/calendar/components/month/index'
+import { VantComponent } from '../../../common/component';
+import { getMonthEndDay, compareDay, getPrevDay, getNextDay, } from '../../utils';
+VantComponent({
+    props: {
+        date: {
+            type: null,
+            observer: 'setDays',
+        },
+        type: {
+            type: String,
+            observer: 'setDays',
+        },
+        color: String,
+        minDate: {
+            type: null,
+            observer: 'setDays',
+        },
+        maxDate: {
+            type: null,
+            observer: 'setDays',
+        },
+        showMark: Boolean,
+        rowHeight: null,
+        formatter: {
+            type: null,
+            observer: 'setDays',
+        },
+        currentDate: {
+            type: null,
+            observer: 'setDays',
+        },
+        firstDayOfWeek: {
+            type: Number,
+            observer: 'setDays',
+        },
+        allowSameDay: Boolean,
+        showSubtitle: Boolean,
+        showMonthTitle: Boolean,
+    },
+    data: {
+        visible: true,
+        days: [],
+    },
+    methods: {
+        onClick(event) {
+            const { index } = event.currentTarget.dataset;
+            const item = this.data.days[index];
+            if (item.type !== 'disabled') {
+                this.$emit('click', item);
+            }
+        },
+        setDays() {
+            const days = [];
+            const startDate = new Date(this.data.date);
+            const year = startDate.getFullYear();
+            const month = startDate.getMonth();
+            const totalDay = getMonthEndDay(startDate.getFullYear(), startDate.getMonth() + 1);
+            for (let day = 1; day <= totalDay; day++) {
+                const date = new Date(year, month, day);
+                const type = this.getDayType(date);
+                let config = {
+                    date,
+                    type,
+                    text: day,
+                    bottomInfo: this.getBottomInfo(type),
+                };
+                if (this.data.formatter) {
+                    config = this.data.formatter(config);
+                }
+                days.push(config);
+            }
+            this.setData({ days });
+        },
+        getMultipleDayType(day) {
+            const { currentDate } = this.data;
+            if (!Array.isArray(currentDate)) {
+                return '';
+            }
+            const isSelected = (date) => currentDate.some((item) => compareDay(item, date) === 0);
+            if (isSelected(day)) {
+                const prevDay = getPrevDay(day);
+                const nextDay = getNextDay(day);
+                const prevSelected = isSelected(prevDay);
+                const nextSelected = isSelected(nextDay);
+                if (prevSelected && nextSelected) {
+                    return 'multiple-middle';
+                }
+                if (prevSelected) {
+                    return 'end';
+                }
+                return nextSelected ? 'start' : 'multiple-selected';
+            }
+            return '';
+        },
+        getRangeDayType(day) {
+            const { currentDate, allowSameDay } = this.data;
+            if (!Array.isArray(currentDate)) {
+                return '';
+            }
+            const [startDay, endDay] = currentDate;
+            if (!startDay) {
+                return '';
+            }
+            const compareToStart = compareDay(day, startDay);
+            if (!endDay) {
+                return compareToStart === 0 ? 'start' : '';
+            }
+            const compareToEnd = compareDay(day, endDay);
+            if (compareToStart === 0 && compareToEnd === 0 && allowSameDay) {
+                return 'start-end';
+            }
+            if (compareToStart === 0) {
+                return 'start';
+            }
+            if (compareToEnd === 0) {
+                return 'end';
+            }
+            if (compareToStart > 0 && compareToEnd < 0) {
+                return 'middle';
+            }
+            return '';
+        },
+        getDayType(day) {
+            const { type, minDate, maxDate, currentDate } = this.data;
+            if (compareDay(day, minDate) < 0 || compareDay(day, maxDate) > 0) {
+                return 'disabled';
+            }
+            if (type === 'single') {
+                return compareDay(day, currentDate) === 0 ? 'selected' : '';
+            }
+            if (type === 'multiple') {
+                return this.getMultipleDayType(day);
+            }
+            /* istanbul ignore else */
+            if (type === 'range') {
+                return this.getRangeDayType(day);
+            }
+            return '';
+        },
+        getBottomInfo(type) {
+            if (this.data.type === 'range') {
+                if (type === 'start') {
+                    return '开始';
+                }
+                if (type === 'end') {
+                    return '结束';
+                }
+                if (type === 'start-end') {
+                    return '开始/结束';
+                }
+            }
+        },
+    },
+});
+export default global['__wxComponents']['vant/dist/calendar/components/month/index']
+</script>
+<style platform="mp-weixin">
+@import '../../../common/index.css';.van-calendar{background-color:var(--calendar-background-color,#fff);display:flex;flex-direction:column;height:100%}.van-calendar__month-title{font-size:var(--calendar-month-title-font-size,14px);font-weight:var(--font-weight-bold,500);height:var(--calendar-header-title-height,44px);line-height:var(--calendar-header-title-height,44px);text-align:center}.van-calendar__days{display:flex;flex-wrap:wrap;position:relative;-webkit-user-select:none;user-select:none}.van-calendar__month-mark{color:var(--calendar-month-mark-color,rgba(242,243,245,.8));font-size:var(--calendar-month-mark-font-size,160px);left:50%;pointer-events:none;position:absolute;top:50%;transform:translate(-50%,-50%);z-index:0}.van-calendar__day,.van-calendar__selected-day{align-items:center;display:flex;justify-content:center;text-align:center}.van-calendar__day{font-size:var(--calendar-day-font-size,16px);height:var(--calendar-day-height,64px);position:relative;width:14.285%}.van-calendar__day--end,.van-calendar__day--multiple-middle,.van-calendar__day--multiple-selected,.van-calendar__day--start,.van-calendar__day--start-end{background-color:var(--calendar-range-edge-background-color,#ee0a24);color:var(--calendar-range-edge-color,#fff)}.van-calendar__day--start{border-radius:4px 0 0 4px}.van-calendar__day--end{border-radius:0 4px 4px 0}.van-calendar__day--multiple-selected,.van-calendar__day--start-end{border-radius:4px}.van-calendar__day--middle{color:var(--calendar-range-middle-color,#ee0a24)}.van-calendar__day--middle:after{background-color:currentColor;bottom:0;content:"";left:0;opacity:var(--calendar-range-middle-background-opacity,.1);position:absolute;right:0;top:0}.van-calendar__day--disabled{color:var(--calendar-day-disabled-color,#c8c9cc);cursor:default}.van-calendar__bottom-info,.van-calendar__top-info{font-size:var(--calendar-info-font-size,10px);left:0;line-height:var(--calendar-info-line-height,14px);position:absolute;right:0}@media (max-width:350px){.van-calendar__bottom-info,.van-calendar__top-info{font-size:9px}}.van-calendar__top-info{top:6px}.van-calendar__bottom-info{bottom:6px}.van-calendar__selected-day{background-color:var(--calendar-selected-day-background-color,#ee0a24);border-radius:4px;color:var(--calendar-selected-day-color,#fff);height:var(--calendar-selected-day-size,54px);width:var(--calendar-selected-day-size,54px)}
+</style>

wxcomponents/vant/dist/calendar/components/month/index.wxml

@@ -0,0 +1,39 @@
+<wxs src="./index.wxs" module="computed"></wxs>
+<wxs src="../../../wxs/utils.wxs" module="utils" />
+
+<view class="van-calendar__month" style="{{ computed.getMonthStyle(visible, date, rowHeight) }}">
+  <view wx:if="{{ showMonthTitle }}" class="van-calendar__month-title">
+    {{ computed.formatMonthTitle(date) }}
+  </view>
+
+  <view wx:if="{{ visible }}" class="van-calendar__days">
+    <view wx:if="{{ showMark }}" class="van-calendar__month-mark">
+      {{ computed.getMark(date) }}
+    </view>
+
+    <view
+      wx:for="{{ days }}"
+      wx:key="index"
+      style="{{ computed.getDayStyle(item.type, index, date, rowHeight, color, firstDayOfWeek) }}"
+      class="{{ utils.bem('calendar__day', [item.type]) }} {{ item.className }}"
+      data-index="{{ index }}"
+      bindtap="onClick"
+    >
+      <view wx:if="{{ item.type === 'selected' }}" class="van-calendar__selected-day" style="width: {{ rowHeight }}px; height: {{ rowHeight }}px; background: {{ color }}">
+        <view wx:if="{{ item.topInfo }}" class="van-calendar__top-info">{{ item.topInfo }}</view>
+        {{ item.text }}
+        <view wx:if="{{ item.bottomInfo }}" class="van-calendar__bottom-info">
+          {{ item.bottomInfo }}
+        </view>
+      </view>
+
+      <view wx:else>
+        <view wx:if="{{ item.topInfo }}" class="van-calendar__top-info">{{ item.topInfo }}</view>
+        {{ item.text }}
+        <view wx:if="{{ item.bottomInfo }}" class="van-calendar__bottom-info">
+          {{ item.bottomInfo }}
+        </view>
+      </view>
+    </view>
+  </view>
+</view>

wxcomponents/vant/dist/calendar/components/month/index.wxs

@@ -0,0 +1,71 @@
+/* eslint-disable */
+var utils = require('../../utils.wxs');
+
+function getMark(date) {
+  return getDate(date).getMonth() + 1;
+}
+
+var ROW_HEIGHT = 64;
+
+function getDayStyle(type, index, date, rowHeight, color, firstDayOfWeek) {
+  var style = [];
+  var current = getDate(date).getDay() || 7;
+  var offset = current < firstDayOfWeek ? (7 - firstDayOfWeek + current) :
+               current === 7 && firstDayOfWeek === 0 ? 0 :
+               (current - firstDayOfWeek);
+
+  if (index === 0) {
+    style.push(['margin-left', (100 * offset) / 7 + '%']);
+  }
+
+  if (rowHeight !== ROW_HEIGHT) {
+    style.push(['height', rowHeight + 'px']);
+  }
+
+  if (color) {
+    if (
+      type === 'start' ||
+      type === 'end' ||
+      type === 'start-end' ||
+      type === 'multiple-selected' ||
+      type === 'multiple-middle'
+    ) {
+      style.push(['background', color]);
+    } else if (type === 'middle') {
+      style.push(['color', color]);
+    }
+  }
+
+  return style
+    .map(function(item) {
+      return item.join(':');
+    })
+    .join(';');
+}
+
+function formatMonthTitle(date) {
+  date = getDate(date);
+  return date.getFullYear() + '年' + (date.getMonth() + 1) + '月';
+}
+
+function getMonthStyle(visible, date, rowHeight) {
+  if (!visible) {
+    date = getDate(date);
+
+    var totalDay = utils.getMonthEndDay(
+      date.getFullYear(),
+      date.getMonth() + 1
+    );
+    var offset = getDate(date).getDay();
+    var padding = Math.ceil((totalDay + offset) / 7) * rowHeight;
+
+    return 'padding-bottom:' + padding + 'px';
+  }
+}
+
+module.exports = {
+  getMark: getMark,
+  getDayStyle: getDayStyle,
+  formatMonthTitle: formatMonthTitle,
+  getMonthStyle: getMonthStyle
+};

wxcomponents/vant/dist/calendar/components/month/index.wxss

@@ -0,0 +1 @@
+@import '../../../common/index.wxss';.van-calendar{background-color:var(--calendar-background-color,#fff);display:flex;flex-direction:column;height:100%}.van-calendar__month-title{font-size:var(--calendar-month-title-font-size,14px);font-weight:var(--font-weight-bold,500);height:var(--calendar-header-title-height,44px);line-height:var(--calendar-header-title-height,44px);text-align:center}.van-calendar__days{display:flex;flex-wrap:wrap;position:relative;-webkit-user-select:none;user-select:none}.van-calendar__month-mark{color:var(--calendar-month-mark-color,rgba(242,243,245,.8));font-size:var(--calendar-month-mark-font-size,160px);left:50%;pointer-events:none;position:absolute;top:50%;transform:translate(-50%,-50%);z-index:0}.van-calendar__day,.van-calendar__selected-day{align-items:center;display:flex;justify-content:center;text-align:center}.van-calendar__day{font-size:var(--calendar-day-font-size,16px);height:var(--calendar-day-height,64px);position:relative;width:14.285%}.van-calendar__day--end,.van-calendar__day--multiple-middle,.van-calendar__day--multiple-selected,.van-calendar__day--start,.van-calendar__day--start-end{background-color:var(--calendar-range-edge-background-color,#ee0a24);color:var(--calendar-range-edge-color,#fff)}.van-calendar__day--start{border-radius:4px 0 0 4px}.van-calendar__day--end{border-radius:0 4px 4px 0}.van-calendar__day--multiple-selected,.van-calendar__day--start-end{border-radius:4px}.van-calendar__day--middle{color:var(--calendar-range-middle-color,#ee0a24)}.van-calendar__day--middle:after{background-color:currentColor;bottom:0;content:"";left:0;opacity:var(--calendar-range-middle-background-opacity,.1);position:absolute;right:0;top:0}.van-calendar__day--disabled{color:var(--calendar-day-disabled-color,#c8c9cc);cursor:default}.van-calendar__bottom-info,.van-calendar__top-info{font-size:var(--calendar-info-font-size,10px);left:0;line-height:var(--calendar-info-line-height,14px);position:absolute;right:0}@media (max-width:350px){.van-calendar__bottom-info,.van-calendar__top-info{font-size:9px}}.van-calendar__top-info{top:6px}.van-calendar__bottom-info{bottom:6px}.van-calendar__selected-day{background-color:var(--calendar-selected-day-background-color,#ee0a24);border-radius:4px;color:var(--calendar-selected-day-color,#fff);height:var(--calendar-selected-day-size,54px);width:var(--calendar-selected-day-size,54px)}

wxcomponents/vant/dist/calendar/index.d.ts

@@ -0,0 +1 @@
+export {};

wxcomponents/vant/dist/calendar/index.js

@@ -0,0 +1,342 @@
+import { VantComponent } from '../common/component';
+import { ROW_HEIGHT, getPrevDay, getNextDay, getToday, compareDay, copyDates, calcDateNum, formatMonthTitle, compareMonth, getMonths, getDayByOffset, } from './utils';
+import Toast from '../toast/toast';
+import { requestAnimationFrame } from '../common/utils';
+const initialMinDate = getToday().getTime();
+const initialMaxDate = (() => {
+    const now = getToday();
+    return new Date(now.getFullYear(), now.getMonth() + 6, now.getDate()).getTime();
+})();
+const getTime = (date) => date instanceof Date ? date.getTime() : date;
+VantComponent({
+    props: {
+        title: {
+            type: String,
+            value: '日期选择',
+        },
+        color: String,
+        show: {
+            type: Boolean,
+            observer(val) {
+                if (val) {
+                    this.initRect();
+                    this.scrollIntoView();
+                }
+            },
+        },
+        formatter: null,
+        confirmText: {
+            type: String,
+            value: '确定',
+        },
+        confirmDisabledText: {
+            type: String,
+            value: '确定',
+        },
+        rangePrompt: String,
+        showRangePrompt: {
+            type: Boolean,
+            value: true,
+        },
+        defaultDate: {
+            type: null,
+            observer(val) {
+                this.setData({ currentDate: val });
+                this.scrollIntoView();
+            },
+        },
+        allowSameDay: Boolean,
+        type: {
+            type: String,
+            value: 'single',
+            observer: 'reset',
+        },
+        minDate: {
+            type: Number,
+            value: initialMinDate,
+        },
+        maxDate: {
+            type: Number,
+            value: initialMaxDate,
+        },
+        position: {
+            type: String,
+            value: 'bottom',
+        },
+        rowHeight: {
+            type: null,
+            value: ROW_HEIGHT,
+        },
+        round: {
+            type: Boolean,
+            value: true,
+        },
+        poppable: {
+            type: Boolean,
+            value: true,
+        },
+        showMark: {
+            type: Boolean,
+            value: true,
+        },
+        showTitle: {
+            type: Boolean,
+            value: true,
+        },
+        showConfirm: {
+            type: Boolean,
+            value: true,
+        },
+        showSubtitle: {
+            type: Boolean,
+            value: true,
+        },
+        safeAreaInsetBottom: {
+            type: Boolean,
+            value: true,
+        },
+        closeOnClickOverlay: {
+            type: Boolean,
+            value: true,
+        },
+        maxRange: {
+            type: null,
+            value: null,
+        },
+        minRange: {
+            type: Number,
+            value: 1,
+        },
+        firstDayOfWeek: {
+            type: Number,
+            value: 0,
+        },
+        readonly: Boolean,
+    },
+    data: {
+        subtitle: '',
+        currentDate: null,
+        scrollIntoView: '',
+    },
+    created() {
+        this.setData({
+            currentDate: this.getInitialDate(this.data.defaultDate),
+        });
+    },
+    mounted() {
+        if (this.data.show || !this.data.poppable) {
+            this.initRect();
+            this.scrollIntoView();
+        }
+    },
+    methods: {
+        reset() {
+            this.setData({ currentDate: this.getInitialDate() });
+            this.scrollIntoView();
+        },
+        initRect() {
+            if (this.contentObserver != null) {
+                this.contentObserver.disconnect();
+            }
+            const contentObserver = this.createIntersectionObserver({
+                thresholds: [0, 0.1, 0.9, 1],
+                observeAll: true,
+            });
+            this.contentObserver = contentObserver;
+            contentObserver.relativeTo('.van-calendar__body');
+            contentObserver.observe('.month', (res) => {
+                if (res.boundingClientRect.top <= res.relativeRect.top) {
+                    // @ts-ignore
+                    this.setData({ subtitle: formatMonthTitle(res.dataset.date) });
+                }
+            });
+        },
+        limitDateRange(date, minDate = null, maxDate = null) {
+            minDate = minDate || this.data.minDate;
+            maxDate = maxDate || this.data.maxDate;
+            if (compareDay(date, minDate) === -1) {
+                return minDate;
+            }
+            if (compareDay(date, maxDate) === 1) {
+                return maxDate;
+            }
+            return date;
+        },
+        getInitialDate(defaultDate = null) {
+            const { type, minDate, maxDate, allowSameDay } = this.data;
+            const now = getToday().getTime();
+            if (type === 'range') {
+                if (!Array.isArray(defaultDate)) {
+                    defaultDate = [];
+                }
+                const [startDay, endDay] = defaultDate || [];
+                const start = this.limitDateRange(startDay || now, minDate, getPrevDay(new Date(maxDate)).getTime());
+                const date = getTime(endDay || now);
+                const end = this.limitDateRange(date, allowSameDay ? date : getNextDay(new Date(minDate)).getTime());
+                return [start, end];
+            }
+            if (type === 'multiple') {
+                if (Array.isArray(defaultDate)) {
+                    return defaultDate.map((date) => this.limitDateRange(date));
+                }
+                return [this.limitDateRange(now)];
+            }
+            if (!defaultDate || Array.isArray(defaultDate)) {
+                defaultDate = now;
+            }
+            return this.limitDateRange(defaultDate);
+        },
+        scrollIntoView() {
+            requestAnimationFrame(() => {
+                const { currentDate, type, show, poppable, minDate, maxDate } = this.data;
+                // @ts-ignore
+                const targetDate = type === 'single' ? currentDate : currentDate[0];
+                const displayed = show || !poppable;
+                if (!targetDate || !displayed) {
+                    return;
+                }
+                const months = getMonths(minDate, maxDate);
+                months.some((month, index) => {
+                    if (compareMonth(month, targetDate) === 0) {
+                        this.setData({ scrollIntoView: `month${index}` });
+                        return true;
+                    }
+                    return false;
+                });
+            });
+        },
+        onOpen() {
+            this.$emit('open');
+        },
+        onOpened() {
+            this.$emit('opened');
+        },
+        onClose() {
+            this.$emit('close');
+        },
+        onClosed() {
+            this.$emit('closed');
+        },
+        onClickDay(event) {
+            if (this.data.readonly) {
+                return;
+            }
+            let { date } = event.detail;
+            const { type, currentDate, allowSameDay } = this.data;
+            if (type === 'range') {
+                // @ts-ignore
+                const [startDay, endDay] = currentDate;
+                if (startDay && !endDay) {
+                    const compareToStart = compareDay(date, startDay);
+                    if (compareToStart === 1) {
+                        const { days } = this.selectComponent('.month').data;
+                        days.some((day, index) => {
+                            const isDisabled = day.type === 'disabled' &&
+                                getTime(startDay) < getTime(day.date) &&
+                                getTime(day.date) < getTime(date);
+                            if (isDisabled) {
+                                ({ date } = days[index - 1]);
+                            }
+                            return isDisabled;
+                        });
+                        this.select([startDay, date], true);
+                    }
+                    else if (compareToStart === -1) {
+                        this.select([date, null]);
+                    }
+                    else if (allowSameDay) {
+                        this.select([date, date]);
+                    }
+                }
+                else {
+                    this.select([date, null]);
+                }
+            }
+            else if (type === 'multiple') {
+                let selectedIndex;
+                // @ts-ignore
+                const selected = currentDate.some((dateItem, index) => {
+                    const equal = compareDay(dateItem, date) === 0;
+                    if (equal) {
+                        selectedIndex = index;
+                    }
+                    return equal;
+                });
+                if (selected) {
+                    // @ts-ignore
+                    const cancelDate = currentDate.splice(selectedIndex, 1);
+                    this.setData({ currentDate });
+                    this.unselect(cancelDate);
+                }
+                else {
+                    // @ts-ignore
+                    this.select([...currentDate, date]);
+                }
+            }
+            else {
+                this.select(date, true);
+            }
+        },
+        unselect(dateArray) {
+            const date = dateArray[0];
+            if (date) {
+                this.$emit('unselect', copyDates(date));
+            }
+        },
+        select(date, complete) {
+            if (complete && this.data.type === 'range') {
+                const valid = this.checkRange(date);
+                if (!valid) {
+                    // auto selected to max range if showConfirm
+                    if (this.data.showConfirm) {
+                        this.emit([
+                            date[0],
+                            getDayByOffset(date[0], this.data.maxRange - 1),
+                        ]);
+                    }
+                    else {
+                        this.emit(date);
+                    }
+                    return;
+                }
+            }
+            this.emit(date);
+            if (complete && !this.data.showConfirm) {
+                this.onConfirm();
+            }
+        },
+        emit(date) {
+            this.setData({
+                currentDate: Array.isArray(date) ? date.map(getTime) : getTime(date),
+            });
+            this.$emit('select', copyDates(date));
+        },
+        checkRange(date) {
+            const { maxRange, rangePrompt, showRangePrompt } = this.data;
+            if (maxRange && calcDateNum(date) > maxRange) {
+                if (showRangePrompt) {
+                    Toast({
+                        context: this,
+                        message: rangePrompt || `选择天数不能超过 ${maxRange} 天`,
+                    });
+                }
+                this.$emit('over-range');
+                return false;
+            }
+            return true;
+        },
+        onConfirm() {
+            if (this.data.type === 'range' &&
+                !this.checkRange(this.data.currentDate)) {
+                return;
+            }
+            wx.nextTick(() => {
+                // @ts-ignore
+                this.$emit('confirm', copyDates(this.data.currentDate));
+            });
+        },
+        onClickSubtitle(event) {
+            this.$emit('click-subtitle', event);
+        },
+    },
+});

wxcomponents/vant/dist/calendar/index.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "header": "./components/header/index",
+    "month": "./components/month/index",
+    "van-button": "../button/index",
+    "van-popup": "../popup/index",
+    "van-toast": "../toast/index"
+  }
+}

wxcomponents/vant/dist/calendar/index.vue

@@ -0,0 +1,370 @@
+<template>
+<uni-shadow-root class="vant-dist-calendar-index"><van-popup v-if="poppable" :custom-class="'van-calendar__popup--'+(position)" close-icon-class="van-calendar__close-icon" :show="show" :round="round" :position="position" :closeable="showTitle || showSubtitle" :close-on-click-overlay="closeOnClickOverlay" :safe-area-inset-bottom="safeAreaInsetBottom" @enter="onOpen" @close="onClose" @after-enter="onOpened" @after-leave="onClosed">
+  <include src="./calendar.wxml"></include>
+</van-popup>
+
+<include v-else src="./calendar.wxml"></include>
+
+<van-toast id="van-toast"></van-toast></uni-shadow-root>
+</template>
+<wxs src="./index.wxs" module="computed"></wxs><wxs src="../wxs/utils.wxs" module="utils"></wxs>
+<script>
+
+const __wxTemplateComponentProps = {}
+import __wxTemplateComponent0 from './calendar.vue'
+
+import Header from './components/header/index.vue'
+import Month from './components/month/index.vue'
+import VanButton from '../button/index.vue'
+import VanPopup from '../popup/index.vue'
+import VanToast from '../toast/index.vue'
+global['__wxVueOptions'] = {components:{'header': Header,'month': Month,'van-button': VanButton,'van-popup': VanPopup,'van-toast': VanToast,}}
+
+global['__wxRoute'] = 'vant/dist/calendar/index'
+import { VantComponent } from '../common/component';
+import { ROW_HEIGHT, getPrevDay, getNextDay, getToday, compareDay, copyDates, calcDateNum, formatMonthTitle, compareMonth, getMonths, getDayByOffset, } from './utils';
+import Toast from '../toast/toast';
+import { requestAnimationFrame } from '../common/utils';
+const initialMinDate = getToday().getTime();
+const initialMaxDate = (() => {
+    const now = getToday();
+    return new Date(now.getFullYear(), now.getMonth() + 6, now.getDate()).getTime();
+})();
+const getTime = (date) => date instanceof Date ? date.getTime() : date;
+VantComponent({
+    props: {
+        title: {
+            type: String,
+            value: '日期选择',
+        },
+        color: String,
+        show: {
+            type: Boolean,
+            observer(val) {
+                if (val) {
+                    this.initRect();
+                    this.scrollIntoView();
+                }
+            },
+        },
+        formatter: null,
+        confirmText: {
+            type: String,
+            value: '确定',
+        },
+        confirmDisabledText: {
+            type: String,
+            value: '确定',
+        },
+        rangePrompt: String,
+        showRangePrompt: {
+            type: Boolean,
+            value: true,
+        },
+        defaultDate: {
+            type: null,
+            observer(val) {
+                this.setData({ currentDate: val });
+                this.scrollIntoView();
+            },
+        },
+        allowSameDay: Boolean,
+        type: {
+            type: String,
+            value: 'single',
+            observer: 'reset',
+        },
+        minDate: {
+            type: Number,
+            value: initialMinDate,
+        },
+        maxDate: {
+            type: Number,
+            value: initialMaxDate,
+        },
+        position: {
+            type: String,
+            value: 'bottom',
+        },
+        rowHeight: {
+            type: null,
+            value: ROW_HEIGHT,
+        },
+        round: {
+            type: Boolean,
+            value: true,
+        },
+        poppable: {
+            type: Boolean,
+            value: true,
+        },
+        showMark: {
+            type: Boolean,
+            value: true,
+        },
+        showTitle: {
+            type: Boolean,
+            value: true,
+        },
+        showConfirm: {
+            type: Boolean,
+            value: true,
+        },
+        showSubtitle: {
+            type: Boolean,
+            value: true,
+        },
+        safeAreaInsetBottom: {
+            type: Boolean,
+            value: true,
+        },
+        closeOnClickOverlay: {
+            type: Boolean,
+            value: true,
+        },
+        maxRange: {
+            type: null,
+            value: null,
+        },
+        minRange: {
+            type: Number,
+            value: 1,
+        },
+        firstDayOfWeek: {
+            type: Number,
+            value: 0,
+        },
+        readonly: Boolean,
+    },
+    data: {
+        subtitle: '',
+        currentDate: null,
+        scrollIntoView: '',
+    },
+    created() {
+        this.setData({
+            currentDate: this.getInitialDate(this.data.defaultDate),
+        });
+    },
+    mounted() {
+        if (this.data.show || !this.data.poppable) {
+            this.initRect();
+            this.scrollIntoView();
+        }
+    },
+    methods: {
+        reset() {
+            this.setData({ currentDate: this.getInitialDate() });
+            this.scrollIntoView();
+        },
+        initRect() {
+            if (this.contentObserver != null) {
+                this.contentObserver.disconnect();
+            }
+            const contentObserver = this.createIntersectionObserver({
+                thresholds: [0, 0.1, 0.9, 1],
+                observeAll: true,
+            });
+            this.contentObserver = contentObserver;
+            contentObserver.relativeTo('.van-calendar__body');
+            contentObserver.observe('.month', (res) => {
+                if (res.boundingClientRect.top <= res.relativeRect.top) {
+                    // @ts-ignore
+                    this.setData({ subtitle: formatMonthTitle(res.dataset.date) });
+                }
+            });
+        },
+        limitDateRange(date, minDate = null, maxDate = null) {
+            minDate = minDate || this.data.minDate;
+            maxDate = maxDate || this.data.maxDate;
+            if (compareDay(date, minDate) === -1) {
+                return minDate;
+            }
+            if (compareDay(date, maxDate) === 1) {
+                return maxDate;
+            }
+            return date;
+        },
+        getInitialDate(defaultDate = null) {
+            const { type, minDate, maxDate, allowSameDay } = this.data;
+            const now = getToday().getTime();
+            if (type === 'range') {
+                if (!Array.isArray(defaultDate)) {
+                    defaultDate = [];
+                }
+                const [startDay, endDay] = defaultDate || [];
+                const start = this.limitDateRange(startDay || now, minDate, getPrevDay(new Date(maxDate)).getTime());
+                const date = getTime(endDay || now);
+                const end = this.limitDateRange(date, allowSameDay ? date : getNextDay(new Date(minDate)).getTime());
+                return [start, end];
+            }
+            if (type === 'multiple') {
+                if (Array.isArray(defaultDate)) {
+                    return defaultDate.map((date) => this.limitDateRange(date));
+                }
+                return [this.limitDateRange(now)];
+            }
+            if (!defaultDate || Array.isArray(defaultDate)) {
+                defaultDate = now;
+            }
+            return this.limitDateRange(defaultDate);
+        },
+        scrollIntoView() {
+            requestAnimationFrame(() => {
+                const { currentDate, type, show, poppable, minDate, maxDate } = this.data;
+                // @ts-ignore
+                const targetDate = type === 'single' ? currentDate : currentDate[0];
+                const displayed = show || !poppable;
+                if (!targetDate || !displayed) {
+                    return;
+                }
+                const months = getMonths(minDate, maxDate);
+                months.some((month, index) => {
+                    if (compareMonth(month, targetDate) === 0) {
+                        this.setData({ scrollIntoView: `month${index}` });
+                        return true;
+                    }
+                    return false;
+                });
+            });
+        },
+        onOpen() {
+            this.$emit('open');
+        },
+        onOpened() {
+            this.$emit('opened');
+        },
+        onClose() {
+            this.$emit('close');
+        },
+        onClosed() {
+            this.$emit('closed');
+        },
+        onClickDay(event) {
+            if (this.data.readonly) {
+                return;
+            }
+            let { date } = event.detail;
+            const { type, currentDate, allowSameDay } = this.data;
+            if (type === 'range') {
+                // @ts-ignore
+                const [startDay, endDay] = currentDate;
+                if (startDay && !endDay) {
+                    const compareToStart = compareDay(date, startDay);
+                    if (compareToStart === 1) {
+                        const { days } = this.selectComponent('.month').data;
+                        days.some((day, index) => {
+                            const isDisabled = day.type === 'disabled' &&
+                                getTime(startDay) < getTime(day.date) &&
+                                getTime(day.date) < getTime(date);
+                            if (isDisabled) {
+                                ({ date } = days[index - 1]);
+                            }
+                            return isDisabled;
+                        });
+                        this.select([startDay, date], true);
+                    }
+                    else if (compareToStart === -1) {
+                        this.select([date, null]);
+                    }
+                    else if (allowSameDay) {
+                        this.select([date, date]);
+                    }
+                }
+                else {
+                    this.select([date, null]);
+                }
+            }
+            else if (type === 'multiple') {
+                let selectedIndex;
+                // @ts-ignore
+                const selected = currentDate.some((dateItem, index) => {
+                    const equal = compareDay(dateItem, date) === 0;
+                    if (equal) {
+                        selectedIndex = index;
+                    }
+                    return equal;
+                });
+                if (selected) {
+                    // @ts-ignore
+                    const cancelDate = currentDate.splice(selectedIndex, 1);
+                    this.setData({ currentDate });
+                    this.unselect(cancelDate);
+                }
+                else {
+                    // @ts-ignore
+                    this.select([...currentDate, date]);
+                }
+            }
+            else {
+                this.select(date, true);
+            }
+        },
+        unselect(dateArray) {
+            const date = dateArray[0];
+            if (date) {
+                this.$emit('unselect', copyDates(date));
+            }
+        },
+        select(date, complete) {
+            if (complete && this.data.type === 'range') {
+                const valid = this.checkRange(date);
+                if (!valid) {
+                    // auto selected to max range if showConfirm
+                    if (this.data.showConfirm) {
+                        this.emit([
+                            date[0],
+                            getDayByOffset(date[0], this.data.maxRange - 1),
+                        ]);
+                    }
+                    else {
+                        this.emit(date);
+                    }
+                    return;
+                }
+            }
+            this.emit(date);
+            if (complete && !this.data.showConfirm) {
+                this.onConfirm();
+            }
+        },
+        emit(date) {
+            this.setData({
+                currentDate: Array.isArray(date) ? date.map(getTime) : getTime(date),
+            });
+            this.$emit('select', copyDates(date));
+        },
+        checkRange(date) {
+            const { maxRange, rangePrompt, showRangePrompt } = this.data;
+            if (maxRange && calcDateNum(date) > maxRange) {
+                if (showRangePrompt) {
+                    Toast({
+                        context: this,
+                        message: rangePrompt || `选择天数不能超过 ${maxRange} 天`,
+                    });
+                }
+                this.$emit('over-range');
+                return false;
+            }
+            return true;
+        },
+        onConfirm() {
+            if (this.data.type === 'range' &&
+                !this.checkRange(this.data.currentDate)) {
+                return;
+            }
+            wx.nextTick(() => {
+                // @ts-ignore
+                this.$emit('confirm', copyDates(this.data.currentDate));
+            });
+        },
+        onClickSubtitle(event) {
+            this.$emit('click-subtitle', event);
+        },
+    },
+});
+export default global['__wxComponents']['vant/dist/calendar/index']
+</script>
+<style platform="mp-weixin">
+@import '../common/index.css';.van-calendar{background-color:var(--calendar-background-color,#fff);display:flex;flex-direction:column;height:var(--calendar-height,100%)}.van-calendar__close-icon{top:11px}.van-calendar__popup--bottom,.van-calendar__popup--top{height:var(--calendar-popup-height,80%)}.van-calendar__popup--left,.van-calendar__popup--right{height:100%}.van-calendar__body{-webkit-overflow-scrolling:touch;flex:1;overflow:auto}.van-calendar__footer{flex-shrink:0;padding:0 var(--padding-md,16px)}.van-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.van-calendar__footer+.van-calendar__footer,.van-calendar__footer:empty{display:none}.van-calendar__footer:empty+.van-calendar__footer{display:block!important}.van-calendar__confirm{height:var(--calendar-confirm-button-height,36px)!important;line-height:var(--calendar-confirm-button-line-height,34px)!important;margin:var(--calendar-confirm-button-margin,7px 0)!important}
+</style>

wxcomponents/vant/dist/calendar/index.wxml

@@ -0,0 +1,26 @@
+<wxs src="./index.wxs" module="computed" />
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<import src="./calendar.wxml" />
+
+<van-popup
+  wx:if="{{ poppable }}"
+  custom-class="van-calendar__popup--{{ position }}"
+  close-icon-class="van-calendar__close-icon"
+  show="{{ show }}"
+  round="{{ round }}"
+  position="{{ position }}"
+  closeable="{{ showTitle || showSubtitle }}"
+  close-on-click-overlay="{{ closeOnClickOverlay }}"
+  safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
+  bind:enter="onOpen"
+  bind:close="onClose"
+  bind:after-enter="onOpened"
+  bind:after-leave="onClosed"
+>
+  <include src="./calendar.wxml" />
+</van-popup>
+
+<include wx:else src="./calendar.wxml" />
+
+<van-toast id="van-toast" />

wxcomponents/vant/dist/calendar/index.wxs

@@ -0,0 +1,37 @@
+/* eslint-disable */
+var utils = require('./utils.wxs');
+
+function getMonths(minDate, maxDate) {
+  var months = [];
+  var cursor = getDate(minDate);
+
+  cursor.setDate(1);
+
+  do {
+    months.push(cursor.getTime());
+    cursor.setMonth(cursor.getMonth() + 1);
+  } while (utils.compareMonth(cursor, getDate(maxDate)) !== 1);
+
+  return months;
+}
+
+function getButtonDisabled(type, currentDate, minRange) {
+  if (currentDate == null) {
+    return true;
+  }
+
+  if (type === 'range') {
+    return !currentDate[0] || !currentDate[1];
+  }
+
+  if (type === 'multiple') {
+    return currentDate.length < minRange;
+  }
+
+  return !currentDate;
+}
+
+module.exports = {
+  getMonths: getMonths,
+  getButtonDisabled: getButtonDisabled
+};

wxcomponents/vant/dist/calendar/index.wxss

@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-calendar{background-color:var(--calendar-background-color,#fff);display:flex;flex-direction:column;height:var(--calendar-height,100%)}.van-calendar__close-icon{top:11px}.van-calendar__popup--bottom,.van-calendar__popup--top{height:var(--calendar-popup-height,80%)}.van-calendar__popup--left,.van-calendar__popup--right{height:100%}.van-calendar__body{-webkit-overflow-scrolling:touch;flex:1;overflow:auto}.van-calendar__footer{flex-shrink:0;padding:0 var(--padding-md,16px)}.van-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.van-calendar__footer+.van-calendar__footer,.van-calendar__footer:empty{display:none}.van-calendar__footer:empty+.van-calendar__footer{display:block!important}.van-calendar__confirm{height:var(--calendar-confirm-button-height,36px)!important;line-height:var(--calendar-confirm-button-line-height,34px)!important;margin:var(--calendar-confirm-button-margin,7px 0)!important}

wxcomponents/vant/dist/calendar/utils.d.ts

@@ -0,0 +1,12 @@
+export declare const ROW_HEIGHT = 64;
+export declare function formatMonthTitle(date: Date): string;
+export declare function compareMonth(date1: Date | number, date2: Date | number): 0 | 1 | -1;
+export declare function compareDay(day1: Date | number, day2: Date | number): 0 | 1 | -1;
+export declare function getDayByOffset(date: Date, offset: number): Date;
+export declare function getPrevDay(date: Date): Date;
+export declare function getNextDay(date: Date): Date;
+export declare function getToday(): Date;
+export declare function calcDateNum(date: [Date, Date]): number;
+export declare function copyDates(dates: Date | Date[]): Date | Date[];
+export declare function getMonthEndDay(year: number, month: number): number;
+export declare function getMonths(minDate: number, maxDate: number): number[];

wxcomponents/vant/dist/calendar/utils.js

@@ -0,0 +1,83 @@
+export const ROW_HEIGHT = 64;
+export function formatMonthTitle(date) {
+    if (!(date instanceof Date)) {
+        date = new Date(date);
+    }
+    return `${date.getFullYear()}年${date.getMonth() + 1}月`;
+}
+export function compareMonth(date1, date2) {
+    if (!(date1 instanceof Date)) {
+        date1 = new Date(date1);
+    }
+    if (!(date2 instanceof Date)) {
+        date2 = new Date(date2);
+    }
+    const year1 = date1.getFullYear();
+    const year2 = date2.getFullYear();
+    const month1 = date1.getMonth();
+    const month2 = date2.getMonth();
+    if (year1 === year2) {
+        return month1 === month2 ? 0 : month1 > month2 ? 1 : -1;
+    }
+    return year1 > year2 ? 1 : -1;
+}
+export function compareDay(day1, day2) {
+    if (!(day1 instanceof Date)) {
+        day1 = new Date(day1);
+    }
+    if (!(day2 instanceof Date)) {
+        day2 = new Date(day2);
+    }
+    const compareMonthResult = compareMonth(day1, day2);
+    if (compareMonthResult === 0) {
+        const date1 = day1.getDate();
+        const date2 = day2.getDate();
+        return date1 === date2 ? 0 : date1 > date2 ? 1 : -1;
+    }
+    return compareMonthResult;
+}
+export function getDayByOffset(date, offset) {
+    date = new Date(date);
+    date.setDate(date.getDate() + offset);
+    return date;
+}
+export function getPrevDay(date) {
+    return getDayByOffset(date, -1);
+}
+export function getNextDay(date) {
+    return getDayByOffset(date, 1);
+}
+export function getToday() {
+    const today = new Date();
+    today.setHours(0, 0, 0, 0);
+    return today;
+}
+export function calcDateNum(date) {
+    const day1 = new Date(date[0]).getTime();
+    const day2 = new Date(date[1]).getTime();
+    return (day2 - day1) / (1000 * 60 * 60 * 24) + 1;
+}
+export function copyDates(dates) {
+    if (Array.isArray(dates)) {
+        return dates.map((date) => {
+            if (date === null) {
+                return date;
+            }
+            return new Date(date);
+        });
+    }
+    return new Date(dates);
+}
+export function getMonthEndDay(year, month) {
+    return 32 - new Date(year, month - 1, 32).getDate();
+}
+export function getMonths(minDate, maxDate) {
+    const months = [];
+    const cursor = new Date(minDate);
+    cursor.setDate(1);
+    do {
+        months.push(cursor.getTime());
+        cursor.setMonth(cursor.getMonth() + 1);
+    } while (compareMonth(cursor, maxDate) !== 1);
+    return months;
+}

wxcomponents/vant/dist/calendar/utils.wxs

@@ -0,0 +1,25 @@
+/* eslint-disable */
+function getMonthEndDay(year, month) {
+  return 32 -  getDate(year, month - 1, 32).getDate();
+}
+
+function compareMonth(date1, date2) {
+  date1 = getDate(date1);
+  date2 = getDate(date2);
+
+  var year1 = date1.getFullYear();
+  var year2 = date2.getFullYear();
+  var month1 = date1.getMonth();
+  var month2 = date2.getMonth();
+
+  if (year1 === year2) {
+    return month1 === month2 ? 0 : month1 > month2 ? 1 : -1;
+  }
+
+  return year1 > year2 ? 1 : -1;
+}
+
+module.exports = {
+  getMonthEndDay: getMonthEndDay,
+  compareMonth: compareMonth
+};

wxcomponents/vant/dist/card/index.d.ts

@@ -0,0 +1 @@
+export {};

wxcomponents/vant/dist/card/index.js

@@ -0,0 +1,49 @@
+import { link } from '../mixins/link';
+import { VantComponent } from '../common/component';
+VantComponent({
+    classes: [
+        'num-class',
+        'desc-class',
+        'thumb-class',
+        'title-class',
+        'price-class',
+        'origin-price-class',
+    ],
+    mixins: [link],
+    props: {
+        tag: String,
+        num: String,
+        desc: String,
+        thumb: String,
+        title: String,
+        price: {
+            type: String,
+            observer: 'updatePrice',
+        },
+        centered: Boolean,
+        lazyLoad: Boolean,
+        thumbLink: String,
+        originPrice: String,
+        thumbMode: {
+            type: String,
+            value: 'aspectFit',
+        },
+        currency: {
+            type: String,
+            value: '¥',
+        },
+    },
+    methods: {
+        updatePrice() {
+            const { price } = this.data;
+            const priceArr = price.toString().split('.');
+            this.setData({
+                integerStr: priceArr[0],
+                decimalStr: priceArr[1] ? `.${priceArr[1]}` : '',
+            });
+        },
+        onClickThumb() {
+            this.jumpLink('thumbLink');
+        },
+    },
+});

wxcomponents/vant/dist/card/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-tag": "../tag/index"
+  }
+}

wxcomponents/vant/dist/card/index.vue

@@ -0,0 +1,105 @@
+<template>
+<uni-shadow-root class="vant-dist-card-index"><view class="custom-class van-card">
+  <view :class="utils.bem('card__header', { center: centered })">
+    <view class="van-card__thumb" @click="onClickThumb">
+      <image v-if="thumb" :src="thumb" :mode="thumbMode" :lazy-load="lazyLoad" class="van-card__img thumb-class"></image>
+      <slot v-else name="thumb"></slot>
+      <van-tag v-if="tag" mark type="danger" custom-class="van-card__tag">
+        {{ tag }}
+      </van-tag>
+      <slot v-else name="tag"></slot>
+    </view>
+
+    <view :class="'van-card__content '+(utils.bem('card__content', { center: centered }))">
+      <view>
+        <view v-if="title" class="van-card__title title-class">{{ title }}</view>
+        <slot v-else name="title"></slot>
+
+        <view v-if="desc" class="van-card__desc desc-class">{{ desc }}</view>
+        <slot v-else name="desc"></slot>
+
+        <slot name="tags"></slot>
+      </view>
+
+      <view class="van-card__bottom">
+        <slot name="price-top"></slot>
+        <view v-if="price || price === 0" class="van-card__price price-class">
+          <text>{{ currency }}</text>
+          <text class="van-card__price-integer">{{ integerStr }}</text>
+          <text class="van-card__price-decimal">{{ decimalStr }}</text>
+        </view>
+        <slot v-else name="price"></slot>
+        <view v-if="originPrice || originPrice === 0" class="van-card__origin-price origin-price-class">{{ currency }} {{ originPrice }}</view>
+        <slot v-else name="origin-price"></slot>
+        <view v-if="num" class="van-card__num num-class">x {{ num }}</view>
+        <slot v-else name="num"></slot>
+        <slot name="bottom"></slot>
+      </view>
+    </view>
+  </view>
+
+  <view class="van-card__footer">
+    <slot name="footer"></slot>
+  </view>
+</view></uni-shadow-root>
+</template>
+<wxs src="../wxs/utils.wxs" module="utils"></wxs>
+<script>
+import VanTag from '../tag/index.vue'
+global['__wxVueOptions'] = {components:{'van-tag': VanTag}}
+
+global['__wxRoute'] = 'vant/dist/card/index'
+import { link } from '../mixins/link';
+import { VantComponent } from '../common/component';
+VantComponent({
+    classes: [
+        'num-class',
+        'desc-class',
+        'thumb-class',
+        'title-class',
+        'price-class',
+        'origin-price-class',
+    ],
+    mixins: [link],
+    props: {
+        tag: String,
+        num: String,
+        desc: String,
+        thumb: String,
+        title: String,
+        price: {
+            type: String,
+            observer: 'updatePrice',
+        },
+        centered: Boolean,
+        lazyLoad: Boolean,
+        thumbLink: String,
+        originPrice: String,
+        thumbMode: {
+            type: String,
+            value: 'aspectFit',
+        },
+        currency: {
+            type: String,
+            value: '¥',
+        },
+    },
+    methods: {
+        updatePrice() {
+            const { price } = this.data;
+            const priceArr = price.toString().split('.');
+            this.setData({
+                integerStr: priceArr[0],
+                decimalStr: priceArr[1] ? `.${priceArr[1]}` : '',
+            });
+        },
+        onClickThumb() {
+            this.jumpLink('thumbLink');
+        },
+    },
+});
+export default global['__wxComponents']['vant/dist/card/index']
+</script>
+<style platform="mp-weixin">
+@import '../common/index.css';.van-card{background-color:var(--card-background-color,#fafafa);box-sizing:border-box;color:var(--card-text-color,#323233);font-size:var(--card-font-size,12px);padding:var(--card-padding,8px 16px);position:relative}.van-card__header{display:flex}.van-card__header--center{align-items:center;justify-content:center}.van-card__thumb{flex:none;height:var(--card-thumb-size,88px);margin-right:var(--padding-xs,8px);position:relative;width:var(--card-thumb-size,88px)}.van-card__thumb:empty{display:none}.van-card__img{border-radius:8px;height:100%;width:100%}.van-card__content{display:flex;flex:1;flex-direction:column;justify-content:space-between;min-height:var(--card-thumb-size,88px);min-width:0;position:relative}.van-card__content--center{justify-content:center}.van-card__desc,.van-card__title{word-wrap:break-word}.van-card__title{font-weight:700;line-height:var(--card-title-line-height,16px)}.van-card__desc{color:var(--card-desc-color,#646566);line-height:var(--card-desc-line-height,20px)}.van-card__bottom{line-height:20px}.van-card__price{color:var(--card-price-color,#ee0a24);display:inline-block;font-size:var(--card-price-font-size,12px);font-weight:700}.van-card__price-integer{font-size:var(--card-price-integer-font-size,16px)}.van-card__price-decimal,.van-card__price-integer{font-family:var(--card-price-font-family,Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif)}.van-card__origin-price{color:var(--card-origin-price-color,#646566);display:inline-block;font-size:var(--card-origin-price-font-size,10px);margin-left:5px;text-decoration:line-through}.van-card__num{float:right}.van-card__tag{left:0;position:absolute!important;top:2px}.van-card__footer{flex:none;text-align:right;width:100%}
+</style>

wxcomponents/vant/dist/card/index.wxml

@@ -0,0 +1,56 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="custom-class van-card">
+  <view class="{{ utils.bem('card__header', { center: centered }) }}">
+    <view class="van-card__thumb" bind:tap="onClickThumb">
+      <image
+        wx:if="{{ thumb }}"
+        src="{{ thumb }}"
+        mode="{{ thumbMode }}"
+        lazy-load="{{ lazyLoad }}"
+        class="van-card__img thumb-class"
+      />
+      <slot wx:else name="thumb" />
+      <van-tag
+        wx:if="{{ tag }}"
+        mark
+        type="danger"
+        custom-class="van-card__tag"
+      >
+        {{ tag }}
+      </van-tag>
+      <slot wx:else name="tag" />
+    </view>
+
+    <view class="van-card__content {{ utils.bem('card__content', { center: centered }) }}">
+      <view>
+        <view wx:if="{{ title }}" class="van-card__title title-class">{{ title }}</view>
+        <slot wx:else name="title" />
+
+        <view wx:if="{{ desc }}" class="van-card__desc desc-class">{{ desc }}</view>
+        <slot wx:else name="desc" />
+
+        <slot name="tags" />
+      </view>
+
+      <view class="van-card__bottom">
+        <slot name="price-top" />
+        <view wx:if="{{ price || price === 0 }}" class="van-card__price price-class">
+          <text>{{ currency }}</text>
+          <text class="van-card__price-integer">{{ integerStr }}</text>
+          <text class="van-card__price-decimal">{{ decimalStr }}</text>
+        </view>
+        <slot wx:else name="price" />
+        <view wx:if="{{ originPrice || originPrice === 0 }}" class="van-card__origin-price origin-price-class">{{ currency }} {{ originPrice }}</view>
+        <slot wx:else name="origin-price" />
+        <view wx:if="{{ num }}" class="van-card__num num-class">x {{ num }}</view>
+        <slot wx:else  name="num" />
+        <slot name="bottom" />
+      </view>
+    </view>
+  </view>
+
+  <view class="van-card__footer">
+    <slot name="footer" />
+  </view>
+</view>

wxcomponents/vant/dist/card/index.wxss

@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-card{background-color:var(--card-background-color,#fafafa);box-sizing:border-box;color:var(--card-text-color,#323233);font-size:var(--card-font-size,12px);padding:var(--card-padding,8px 16px);position:relative}.van-card__header{display:flex}.van-card__header--center{align-items:center;justify-content:center}.van-card__thumb{flex:none;height:var(--card-thumb-size,88px);margin-right:var(--padding-xs,8px);position:relative;width:var(--card-thumb-size,88px)}.van-card__thumb:empty{display:none}.van-card__img{border-radius:8px;height:100%;width:100%}.van-card__content{display:flex;flex:1;flex-direction:column;justify-content:space-between;min-height:var(--card-thumb-size,88px);min-width:0;position:relative}.van-card__content--center{justify-content:center}.van-card__desc,.van-card__title{word-wrap:break-word}.van-card__title{font-weight:700;line-height:var(--card-title-line-height,16px)}.van-card__desc{color:var(--card-desc-color,#646566);line-height:var(--card-desc-line-height,20px)}.van-card__bottom{line-height:20px}.van-card__price{color:var(--card-price-color,#ee0a24);display:inline-block;font-size:var(--card-price-font-size,12px);font-weight:700}.van-card__price-integer{font-size:var(--card-price-integer-font-size,16px)}.van-card__price-decimal,.van-card__price-integer{font-family:var(--card-price-font-family,Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif)}.van-card__origin-price{color:var(--card-origin-price-color,#646566);display:inline-block;font-size:var(--card-origin-price-font-size,10px);margin-left:5px;text-decoration:line-through}.van-card__num{float:right}.van-card__tag{left:0;position:absolute!important;top:2px}.van-card__footer{flex:none;text-align:right;width:100%}

wxcomponents/vant/dist/cascader/index.d.ts

@@ -0,0 +1 @@
+export {};

wxcomponents/vant/dist/cascader/index.js

@@ -0,0 +1,208 @@
+import { VantComponent } from '../common/component';
+var FieldName;
+(function (FieldName) {
+    FieldName["TEXT"] = "text";
+    FieldName["VALUE"] = "value";
+    FieldName["CHILDREN"] = "children";
+})(FieldName || (FieldName = {}));
+const defaultFieldNames = {
+    text: FieldName.TEXT,
+    value: FieldName.VALUE,
+    children: FieldName.CHILDREN,
+};
+VantComponent({
+    props: {
+        title: String,
+        value: {
+            type: String,
+            observer: 'updateValue',
+        },
+        placeholder: {
+            type: String,
+            value: '请选择',
+        },
+        activeColor: {
+            type: String,
+            value: '#1989fa',
+        },
+        options: {
+            type: Array,
+            value: [],
+            observer: 'updateOptions',
+        },
+        swipeable: {
+            type: Boolean,
+            value: false,
+        },
+        closeable: {
+            type: Boolean,
+            value: true,
+        },
+        showHeader: {
+            type: Boolean,
+            value: true,
+        },
+        closeIcon: {
+            type: String,
+            value: 'cross',
+        },
+        fieldNames: {
+            type: Object,
+            value: defaultFieldNames,
+            observer: 'updateFieldNames',
+        },
+    },
+    data: {
+        tabs: [],
+        activeTab: 0,
+        textKey: FieldName.TEXT,
+        valueKey: FieldName.VALUE,
+        childrenKey: FieldName.CHILDREN,
+    },
+    created() {
+        this.updateTabs();
+    },
+    methods: {
+        updateOptions(val, oldVal) {
+            const isAsync = !!(val.length && oldVal.length);
+            this.updateTabs(isAsync);
+        },
+        updateValue(val) {
+            if (val !== undefined) {
+                const values = this.data.tabs.map((tab) => tab.selected && tab.selected[this.data.valueKey]);
+                if (values.indexOf(val) > -1) {
+                    return;
+                }
+            }
+            this.updateTabs();
+        },
+        updateFieldNames() {
+            const { text = 'text', value = 'value', children = 'children', } = this.data.fieldNames || defaultFieldNames;
+            this.setData({
+                textKey: text,
+                valueKey: value,
+                childrenKey: children,
+            });
+        },
+        getSelectedOptionsByValue(options, value) {
+            for (let i = 0; i < options.length; i++) {
+                const option = options[i];
+                if (option[this.data.valueKey] === value) {
+                    return [option];
+                }
+                if (option[this.data.childrenKey]) {
+                    const selectedOptions = this.getSelectedOptionsByValue(option[this.data.childrenKey], value);
+                    if (selectedOptions) {
+                        return [option, ...selectedOptions];
+                    }
+                }
+            }
+        },
+        updateTabs(isAsync = false) {
+            const { options, value } = this.data;
+            if (value !== undefined) {
+                const selectedOptions = this.getSelectedOptionsByValue(options, value);
+                if (selectedOptions) {
+                    let optionsCursor = options;
+                    const tabs = selectedOptions.map((option) => {
+                        const tab = {
+                            options: optionsCursor,
+                            selected: option,
+                        };
+                        const next = optionsCursor.find((item) => item[this.data.valueKey] === option[this.data.valueKey]);
+                        if (next) {
+                            optionsCursor = next[this.data.childrenKey];
+                        }
+                        return tab;
+                    });
+                    if (optionsCursor) {
+                        tabs.push({
+                            options: optionsCursor,
+                            selected: null,
+                        });
+                    }
+                    this.setData({
+                        tabs,
+                    });
+                    wx.nextTick(() => {
+                        this.setData({
+                            activeTab: tabs.length - 1,
+                        });
+                    });
+                    return;
+                }
+            }
+            // 异步更新
+            if (isAsync) {
+                const { tabs } = this.data;
+                tabs[tabs.length - 1].options =
+                    options[options.length - 1][this.data.childrenKey];
+                this.setData({
+                    tabs,
+                });
+                return;
+            }
+            this.setData({
+                tabs: [
+                    {
+                        options,
+                        selected: null,
+                    },
+                ],
+            });
+        },
+        onClose() {
+            this.$emit('close');
+        },
+        onClickTab(e) {
+            const { index: tabIndex, title } = e.detail;
+            this.$emit('click-tab', { title, tabIndex });
+            this.setData({
+                activeTab: tabIndex,
+            });
+        },
+        // 选中
+        onSelect(e) {
+            const { option, tabIndex } = e.currentTarget.dataset;
+            if (option && option.disabled) {
+                return;
+            }
+            const { valueKey, childrenKey } = this.data;
+            let { tabs } = this.data;
+            tabs[tabIndex].selected = option;
+            if (tabs.length > tabIndex + 1) {
+                tabs = tabs.slice(0, tabIndex + 1);
+            }
+            if (option[childrenKey]) {
+                const nextTab = {
+                    options: option[childrenKey],
+                    selected: null,
+                };
+                if (tabs[tabIndex + 1]) {
+                    tabs[tabIndex + 1] = nextTab;
+                }
+                else {
+                    tabs.push(nextTab);
+                }
+                wx.nextTick(() => {
+                    this.setData({
+                        activeTab: tabIndex + 1,
+                    });
+                });
+            }
+            this.setData({
+                tabs,
+            });
+            const selectedOptions = tabs.map((tab) => tab.selected).filter(Boolean);
+            const params = {
+                value: option[valueKey],
+                tabIndex,
+                selectedOptions,
+            };
+            this.$emit('change', params);
+            if (!option[childrenKey]) {
+                this.$emit('finish', params);
+            }
+        },
+    },
+});

wxcomponents/vant/dist/cascader/index.json

@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-tab":  "../tab/index",
+    "van-tabs": "../tabs/index"
+  }
+}

wxcomponents/vant/dist/cascader/index.vue

@@ -0,0 +1,243 @@
+<template>
+<uni-shadow-root class="vant-dist-cascader-index"><view v-if="showHeader" class="van-cascader__header">
+  <text class="van-cascader__title"><slot name="title"></slot>{{ title }}</text>
+  <van-icon v-if="closeable" :name="closeIcon" class="van-cascader__close-icon" @click.native="onClose"></van-icon>
+</view>
+
+<van-tabs :active="activeTab" custom-class="van-cascader__tabs" wrap-class="van-cascader__tabs-wrap" tab-class="van-cascader__tab" :color="activeColor" :border="false" :swipeable="swipeable" @click="onClickTab">
+  <van-tab v-for="(tab,tabIndex) in (tabs)" :key="tab.tabIndex" :title="tab.selected ? tab.selected[textKey] : placeholder" style="width: 100%;" :title-style="(!tab.selected ? 'color: #969799;font-weight:normal;' : '')">
+    
+    
+
+    <view class="van-cascader__options">
+      <view v-for="(option,index) in (tab.options)" :key="option.index" :class="(option.className)+' '+(utils.optionClass(tab, textKey, option))" :style="utils.optionStyle({ tab, textKey, option, activeColor })" :data-option="option" :data-tab-index="tabIndex" @click="onSelect">
+        <text>{{ option[textKey] }}</text>
+        <van-icon v-if="utils.isSelected(tab, textKey, option)" name="success" size="18"></van-icon>
+      </view>
+    </view>
+    
+    
+  </van-tab>
+</van-tabs></uni-shadow-root>
+</template>
+<wxs src="./index.wxs" module="utils"></wxs>
+<script>
+import VanIcon from '../icon/index.vue'
+import VanTab from '../tab/index.vue'
+import VanTabs from '../tabs/index.vue'
+global['__wxVueOptions'] = {components:{'van-icon': VanIcon,'van-tab': VanTab,'van-tabs': VanTabs}}
+
+global['__wxRoute'] = 'vant/dist/cascader/index'
+import { VantComponent } from '../common/component';
+var FieldName;
+(function (FieldName) {
+    FieldName["TEXT"] = "text";
+    FieldName["VALUE"] = "value";
+    FieldName["CHILDREN"] = "children";
+})(FieldName || (FieldName = {}));
+const defaultFieldNames = {
+    text: FieldName.TEXT,
+    value: FieldName.VALUE,
+    children: FieldName.CHILDREN,
+};
+VantComponent({
+    props: {
+        title: String,
+        value: {
+            type: String,
+            observer: 'updateValue',
+        },
+        placeholder: {
+            type: String,
+            value: '请选择',
+        },
+        activeColor: {
+            type: String,
+            value: '#1989fa',
+        },
+        options: {
+            type: Array,
+            value: [],
+            observer: 'updateOptions',
+        },
+        swipeable: {
+            type: Boolean,
+            value: false,
+        },
+        closeable: {
+            type: Boolean,
+            value: true,
+        },
+        showHeader: {
+            type: Boolean,
+            value: true,
+        },
+        closeIcon: {
+            type: String,
+            value: 'cross',
+        },
+        fieldNames: {
+            type: Object,
+            value: defaultFieldNames,
+            observer: 'updateFieldNames',
+        },
+    },
+    data: {
+        tabs: [],
+        activeTab: 0,
+        textKey: FieldName.TEXT,
+        valueKey: FieldName.VALUE,
+        childrenKey: FieldName.CHILDREN,
+    },
+    created() {
+        this.updateTabs();
+    },
+    methods: {
+        updateOptions(val, oldVal) {
+            const isAsync = !!(val.length && oldVal.length);
+            this.updateTabs(isAsync);
+        },
+        updateValue(val) {
+            if (val !== undefined) {
+                const values = this.data.tabs.map((tab) => tab.selected && tab.selected[this.data.valueKey]);
+                if (values.indexOf(val) > -1) {
+                    return;
+                }
+            }
+            this.updateTabs();
+        },
+        updateFieldNames() {
+            const { text = 'text', value = 'value', children = 'children', } = this.data.fieldNames || defaultFieldNames;
+            this.setData({
+                textKey: text,
+                valueKey: value,
+                childrenKey: children,
+            });
+        },
+        getSelectedOptionsByValue(options, value) {
+            for (let i = 0; i < options.length; i++) {
+                const option = options[i];
+                if (option[this.data.valueKey] === value) {
+                    return [option];
+                }
+                if (option[this.data.childrenKey]) {
+                    const selectedOptions = this.getSelectedOptionsByValue(option[this.data.childrenKey], value);
+                    if (selectedOptions) {
+                        return [option, ...selectedOptions];
+                    }
+                }
+            }
+        },
+        updateTabs(isAsync = false) {
+            const { options, value } = this.data;
+            if (value !== undefined) {
+                const selectedOptions = this.getSelectedOptionsByValue(options, value);
+                if (selectedOptions) {
+                    let optionsCursor = options;
+                    const tabs = selectedOptions.map((option) => {
+                        const tab = {
+                            options: optionsCursor,
+                            selected: option,
+                        };
+                        const next = optionsCursor.find((item) => item[this.data.valueKey] === option[this.data.valueKey]);
+                        if (next) {
+                            optionsCursor = next[this.data.childrenKey];
+                        }
+                        return tab;
+                    });
+                    if (optionsCursor) {
+                        tabs.push({
+                            options: optionsCursor,
+                            selected: null,
+                        });
+                    }
+                    this.setData({
+                        tabs,
+                    });
+                    wx.nextTick(() => {
+                        this.setData({
+                            activeTab: tabs.length - 1,
+                        });
+                    });
+                    return;
+                }
+            }
+            // 异步更新
+            if (isAsync) {
+                const { tabs } = this.data;
+                tabs[tabs.length - 1].options =
+                    options[options.length - 1][this.data.childrenKey];
+                this.setData({
+                    tabs,
+                });
+                return;
+            }
+            this.setData({
+                tabs: [
+                    {
+                        options,
+                        selected: null,
+                    },
+                ],
+            });
+        },
+        onClose() {
+            this.$emit('close');
+        },
+        onClickTab(e) {
+            const { index: tabIndex, title } = e.detail;
+            this.$emit('click-tab', { title, tabIndex });
+            this.setData({
+                activeTab: tabIndex,
+            });
+        },
+        // 选中
+        onSelect(e) {
+            const { option, tabIndex } = e.currentTarget.dataset;
+            if (option && option.disabled) {
+                return;
+            }
+            const { valueKey, childrenKey } = this.data;
+            let { tabs } = this.data;
+            tabs[tabIndex].selected = option;
+            if (tabs.length > tabIndex + 1) {
+                tabs = tabs.slice(0, tabIndex + 1);
+            }
+            if (option[childrenKey]) {
+                const nextTab = {
+                    options: option[childrenKey],
+                    selected: null,
+                };
+                if (tabs[tabIndex + 1]) {
+                    tabs[tabIndex + 1] = nextTab;
+                }
+                else {
+                    tabs.push(nextTab);
+                }
+                wx.nextTick(() => {
+                    this.setData({
+                        activeTab: tabIndex + 1,
+                    });
+                });
+            }
+            this.setData({
+                tabs,
+            });
+            const selectedOptions = tabs.map((tab) => tab.selected).filter(Boolean);
+            const params = {
+                value: option[valueKey],
+                tabIndex,
+                selectedOptions,
+            };
+            this.$emit('change', params);
+            if (!option[childrenKey]) {
+                this.$emit('finish', params);
+            }
+        },
+    },
+});
+export default global['__wxComponents']['vant/dist/cascader/index']
+</script>
+<style platform="mp-weixin">
+@import '../common/index.css';.van-cascader__header{align-items:center;display:flex;height:48px;justify-content:space-between;padding:0 16px}.van-cascader__title{font-size:16px;font-weight:600;line-height:20px}.van-cascader__close-icon{color:#c8c9cc;font-size:22px;height:22px}.van-cascader__tabs-wrap{height:48px!important;padding:0 8px}.van-cascader__tab{color:#323233!important;flex:none!important;font-weight:600!important;padding:0 8px!important}.van-cascader__tab--unselected{color:#969799!important;font-weight:400!important}.van-cascader__option{align-items:center;cursor:pointer;display:flex;font-size:14px;justify-content:space-between;line-height:20px;padding:10px 16px}.van-cascader__option:active{background-color:#f2f3f5}.van-cascader__option--selected{color:#1989fa;font-weight:600}.van-cascader__option--disabled{color:#c8c9cc;cursor:not-allowed}.van-cascader__option--disabled:active{background-color:initial}.van-cascader__options{-webkit-overflow-scrolling:touch;box-sizing:border-box;height:384px;overflow-y:auto;padding-top:6px}
+</style>

wxcomponents/vant/dist/cascader/index.wxml

@@ -0,0 +1,53 @@
+<wxs src="./index.wxs" module="utils" />
+
+<view wx:if="{{ showHeader }}" class="van-cascader__header">
+  <text class="van-cascader__title"><slot name="title"></slot>{{ title }}</text>
+  <van-icon
+    wx:if="{{ closeable }}"
+    name="{{ closeIcon }}"
+    class="van-cascader__close-icon"
+    bind:tap="onClose"
+  />
+</view>
+
+<van-tabs
+  active="{{ activeTab }}"
+  custom-class="van-cascader__tabs"
+  wrap-class="van-cascader__tabs-wrap"
+  tab-class="van-cascader__tab"
+  color="{{ activeColor }}"
+  border="{{ false }}"
+  swipeable="{{ swipeable }}"
+  bind:click="onClickTab"
+>
+  <van-tab
+    wx:for="{{ tabs }}"
+    wx:for-item="tab"
+    wx:for-index="tabIndex"
+    wx:key="tabIndex"
+    title="{{ tab.selected ? tab.selected[textKey] : placeholder }}"
+    style="width: 100%;"
+    title-style="{{ !tab.selected ? 'color: #969799;font-weight:normal;' : '' }}"
+  >
+    <!-- 暂不支持 -->
+    <!-- <slot name="options-top"></slot> -->
+
+    <view class="van-cascader__options">
+      <view
+        wx:for="{{ tab.options }}"
+        wx:for-item="option"
+        wx:key="index"
+        class="{{ option.className }} {{ utils.optionClass(tab, textKey, option) }}"
+        style="{{ utils.optionStyle({ tab, textKey, option, activeColor }) }}"
+        data-option="{{ option }}"
+        data-tab-index="{{ tabIndex }}"
+        bind:tap="onSelect"
+      >
+        <text>{{ option[textKey] }}</text>
+        <van-icon wx:if="{{ utils.isSelected(tab, textKey, option) }}" name="success" size="18" />
+      </view>
+    </view>
+    <!-- 暂不支持 -->
+    <!-- <slot name="options-bottom"></slot> -->
+  </van-tab>
+</van-tabs>

wxcomponents/vant/dist/cascader/index.wxs

@@ -0,0 +1,24 @@
+var utils = require('../wxs/utils.wxs');
+var style = require('../wxs/style.wxs');
+
+function isSelected(tab, textKey, option) {
+  return tab.selected && tab.selected[textKey] === option[textKey]
+}
+
+function optionClass(tab, textKey, option) {
+  return utils.bem('cascader__option', { selected: isSelected({ tab, textKey, option }), disabled: option.disabled })
+}
+
+function optionStyle(data) {
+  var color = data.option.color || (isSelected(data.tab, data.textKey, data.option) ? data.activeColor : undefined);
+  return style({
+    color
+  });
+}
+
+
+module.exports = {
+  isSelected: isSelected,
+  optionClass: optionClass,
+  optionStyle: optionStyle,
+};

wxcomponents/vant/dist/cascader/index.wxss

@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-cascader__header{align-items:center;display:flex;height:48px;justify-content:space-between;padding:0 16px}.van-cascader__title{font-size:16px;font-weight:600;line-height:20px}.van-cascader__close-icon{color:#c8c9cc;font-size:22px;height:22px}.van-cascader__tabs-wrap{height:48px!important;padding:0 8px}.van-cascader__tab{color:#323233!important;flex:none!important;font-weight:600!important;padding:0 8px!important}.van-cascader__tab--unselected{color:#969799!important;font-weight:400!important}.van-cascader__option{align-items:center;cursor:pointer;display:flex;font-size:14px;justify-content:space-between;line-height:20px;padding:10px 16px}.van-cascader__option:active{background-color:#f2f3f5}.van-cascader__option--selected{color:#1989fa;font-weight:600}.van-cascader__option--disabled{color:#c8c9cc;cursor:not-allowed}.van-cascader__option--disabled:active{background-color:initial}.van-cascader__options{-webkit-overflow-scrolling:touch;box-sizing:border-box;height:384px;overflow-y:auto;padding-top:6px}

wxcomponents/vant/dist/cell-group/index.d.ts

@@ -0,0 +1 @@
+export {};

wxcomponents/vant/dist/cell-group/index.js

@@ -0,0 +1,11 @@
+import { VantComponent } from '../common/component';
+VantComponent({
+    props: {
+        title: String,
+        border: {
+            type: Boolean,
+            value: true,
+        },
+        inset: Boolean,
+    },
+});

wxcomponents/vant/dist/cell-group/index.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

wxcomponents/vant/dist/cell-group/index.vue

@@ -0,0 +1,28 @@
+<template>
+<uni-shadow-root class="vant-dist-cell-group-index"><view v-if="title" :class="utils.bem('cell-group__title', { inset })">
+  {{ title }}
+</view>
+<view :class="'custom-class '+(utils.bem('cell-group', { inset }))+' '+(border ? 'van-hairline--top-bottom' : '')">
+  <slot></slot>
+</view></uni-shadow-root>
+</template>
+<wxs src="../wxs/utils.wxs" module="utils"></wxs>
+<script>
+
+global['__wxRoute'] = 'vant/dist/cell-group/index'
+import { VantComponent } from '../common/component';
+VantComponent({
+    props: {
+        title: String,
+        border: {
+            type: Boolean,
+            value: true,
+        },
+        inset: Boolean,
+    },
+});
+export default global['__wxComponents']['vant/dist/cell-group/index']
+</script>
+<style platform="mp-weixin">
+@import '../common/index.css';.van-cell-group--inset{border-radius:var(--cell-group-inset-border-radius,8px);margin:var(--cell-group-inset-padding,0 16px);overflow:hidden}.van-cell-group__title{color:var(--cell-group-title-color,#969799);font-size:var(--cell-group-title-font-size,14px);line-height:var(--cell-group-title-line-height,16px);padding:var(--cell-group-title-padding,16px 16px 8px)}.van-cell-group__title--inset{padding:var(--cell-group-inset-title-padding,16px 16px 8px 32px)}
+</style>

wxcomponents/vant/dist/cell-group/index.wxml

@@ -0,0 +1,11 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  wx:if="{{ title }}"
+  class="{{ utils.bem('cell-group__title', { inset }) }}"
+>
+  {{ title }}
+</view>
+<view class="custom-class {{ utils.bem('cell-group', { inset }) }} {{ border ? 'van-hairline--top-bottom' : '' }}">
+  <slot />
+</view>

wxcomponents/vant/dist/cell-group/index.wxss

@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-cell-group--inset{border-radius:var(--cell-group-inset-border-radius,8px);margin:var(--cell-group-inset-padding,0 16px);overflow:hidden}.van-cell-group__title{color:var(--cell-group-title-color,#969799);font-size:var(--cell-group-title-font-size,14px);line-height:var(--cell-group-title-line-height,16px);padding:var(--cell-group-title-padding,16px 16px 8px)}.van-cell-group__title--inset{padding:var(--cell-group-inset-title-padding,16px 16px 8px 32px)}

wxcomponents/vant/dist/cell/index.d.ts

@@ -0,0 +1 @@
+export {};

wxcomponents/vant/dist/cell/index.js

@@ -0,0 +1,38 @@
+import { link } from '../mixins/link';
+import { VantComponent } from '../common/component';
+VantComponent({
+    classes: [
+        'title-class',
+        'label-class',
+        'value-class',
+        'right-icon-class',
+        'hover-class',
+    ],
+    mixins: [link],
+    props: {
+        title: null,
+        value: null,
+        icon: String,
+        size: String,
+        label: String,
+        center: Boolean,
+        isLink: Boolean,
+        required: Boolean,
+        clickable: Boolean,
+        titleWidth: String,
+        customStyle: String,
+        arrowDirection: String,
+        useLabelSlot: Boolean,
+        border: {
+            type: Boolean,
+            value: true,
+        },
+        titleStyle: String,
+    },
+    methods: {
+        onClick(event) {
+            this.$emit('click', event.detail);
+            this.jumpLink();
+        },
+    },
+});