update

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+	"editor.formatOnSave": true,
+	"editor.tabSize": 2,
+	"editor.insertSpaces": true,
+	"editor.detectIndentation": false,
+	"editor.codeActionsOnSave": {
+		"source.fixAll.eslint": "explicit",
+		"source.organizeImports": "never"
+	},
+	"eslint.format.enable": true,
+	"eslint.codeAction.showDocumentation": {
+		"enable": true
+	},
+	"eslint.validate": [
+		// "jsonc",
+		"javascript",
+		"javascriptreact",
+		"typescript",
+		"typescriptreact",
+		"vue",
+		"html",
+		"markdown",
+		"json",
+		"yaml"
+	]
+}

package.json

@@ -69,7 +69,7 @@
 		"uview-plus": "^3.1.41",
 		"vue": "3.2.47",
 		"vue-i18n": "^9.1.9",
-		"z-paging": "^2.5.8"
+		"z-paging": "^2.6.3"
 	},
 	"devDependencies": {
 		"@dcloudio/types": "^3.3.2",

pages.config.js

@@ -72,6 +72,7 @@ export default defineUniPages({
     },
     {
       root: 'pages/form',
+      name: 'form',
       pages: [
         {
           path: 'index',
@@ -87,10 +88,18 @@ export default defineUniPages({
             navigationBarTitleText: '订单完成',
           },
         },
+        {
+          path: 'search',
+          aliasPath: '/search',
+          style: {
+            navigationBarTitleText: '',
+          },
+        },
       ],
     },
     {
       root: 'pages/other',
+      name: 'other',
       pages: [
         {
           path: 'income-details',
@@ -167,6 +176,12 @@ export default defineUniPages({
       ],
     },
   ],
+  preloadRule: {
+    "pages/index/home/index": {
+      network: "all",
+      packages: ["pages/form", "pages/other"]  // 在 pages/index 页面中预加载名为 pack1 分包内容
+    }
+  },
   tabBar: {
     // color: '#999999',
     // selectedColor: '#018d71',
@@ -203,8 +218,8 @@ export default defineUniPages({
       // "van-checkbox": "/wxcomponents/vant-weapp/checkbox",
       // "van-cell-group": "/wxcomponents/vant-weapp/cell-group",
       // "van-checkbox-group": "/wxcomponents/vant-weapp/checkbox-group",
-      "van-rate": "/wxcomponents/vant-weapp/rate",
-      "van-icon": "/wxcomponents/vant-weapp/icon"
+      // "van-rate": "/wxcomponents/vant-weapp/rate",
+      // "van-icon": "/wxcomponents/vant-weapp/icon"
       // "van-tabbar": "/wxcomponents/@vant/weapp/tabbar/index",
       // "van-tabbar-item": "/wxcomponents/@vant/weapp/tabbar-item/index"
     }

src/App.vue

@@ -18,6 +18,6 @@ export default {
 @import 'uview-plus/index.scss';
 
 /* #ifdef MP-WEIXIN */
-@import '@/wxcomponents/vant-weapp/common/index.wxss';
+// @import '@/wxcomponents/vant-weapp/common/index.wxss';
 /* #endif */
 </style>

src/api/base/index.js

@@ -73,4 +73,20 @@ export const fetchPzServerList = params =>
  * @desc 医院列表
 */
 export const fetchPzHospitalList = params =>
-  request.get('/pzhospital/list', params)
+  request.get('/pzhospital/listAll', params)
+
+/**
+ * @desc 上门服务列表
+*/
+export const fetchServerTypeList = params =>
+  request.get('/visittype/listAll', params)
+/**
+ * @desc 报告列表
+*/
+export const fetchReportTypelList = params =>
+  request.get('/reporttype/listAll', params)
+/**
+ * @desc 轮播图
+*/
+export const fetchSwiperList = params =>
+  request.get('/swiper/listAll', params)

src/api/index.js

@@ -2,16 +2,18 @@ import * as base from './base/index.js'
 import * as user from './user/index.js'
 import * as home from './home/index.js'
 import * as realname from './realname/index.js'
+import * as order from './order/index.js'
 
 const api = {
   ...base,
   ...user,
   ...home,
   ...realname,
+  ...order,
 }
 
 export default {
-  install(app) {
+  install (app) {
     app.config.globalProperties.$api = api
   },
 }

src/api/order/index.js

@@ -0,0 +1,72 @@
+import request from '@/utils/request/index.js'
+
+/**
+ * @description 下单
+ */
+export const orderCreate = data =>
+  request.post('/orderCreate', data)
+
+/**
+ * @description 支付
+ */
+export const orderPay = data =>
+  request.post('/payment', data)
+
+/**
+ * @description 获取订单信息
+*/
+export const orderInfo = params =>
+  request.get('/order/infomation', params)
+/**
+ * @description 开始服务
+*/
+export const startOrder = params =>
+  request.get('/order/start', params)
+
+/**
+ * @description 获取取消原因列表
+*/
+export const reasonList = params =>
+  request.get('/reason/list', params)
+
+/**
+ * @description 获取订单列表
+*/
+export const orderList = data =>
+  request.post('/order/orderList', data)
+
+/**
+ * @description 取消订单
+*/
+export const cancelOrder = data =>
+  request.post('/order/cancelOrder', data)
+/**
+ * @description 申请退款
+*/
+export const orderRefund = data =>
+  request.post('/refund', data)
+/**
+ * @description 订单完成 & 打分
+*/
+export const orderComentSubmit = data =>
+  request.post('/comment/submit', data)
+/**
+ * @description 订单完成 & 打分 详情
+*/
+export const orderComentInfo = params =>
+  request.get('/comment/infomation', params)
+/**
+ * @description  今日收入
+*/
+export const orderTodayIncome = data =>
+  request.post('/order/todayIncome', data)
+/**
+ * @description  提现
+*/
+export const cashSubmit = data =>
+  request.post('/cash/submit', data)
+/**
+ * @description  提现记录
+*/
+export const cashSubmitRecord = data =>
+  request.post('/cash/record', data)

src/api/user/index.js

@@ -7,6 +7,7 @@ import request from '@/utils/request/index.js'
 export const userLogin = data =>
   // mock({ ...data, mockData: { token: 'mock-token' } })
   request.post('/wxlogin', data)
+
 /**
  * @description 保存用户信息
  */
@@ -27,6 +28,25 @@ export const getUser = params =>
   // mock({ ...data, mockData: { token: 'mock-token' } })
   request.get('/wxUser/info', params)
 
+/**
+ * @description 陪诊师申请信息
+ */
+export const doctorSave = data =>
+  request.post('/doctor/save', data)
+
+/**
+ * @description 获取陪诊师信息
+*/
+export const doctorInfo = params =>
+  request.get('/doctor/infomation', params)
+
+/**
+ * @description 切换身份信息
+ */
+export const checkRole = data =>
+  request.post('/wxUser/checkRole', data)
+
+
 /**
  * @description 获取当前登录用户信息
  * @param realStatus 1-未实名 2-实名中 3--已经实名 4-实名失败

src/components/agreed-comp/agreed-comp.vue

@@ -8,7 +8,9 @@
 			labelColor="#666"
 			labelSize="24rpx"
 			@change="handleChange"
+			:disabled="disabled"
 		>
+			<!-- @click="handleAgreeCheck" -->
 			<u-checkbox activeColor="#FF8CA6" name="1"></u-checkbox>
 			<!-- label="我已阅读并同意" -->
 		</u-checkbox-group>
@@ -34,24 +36,29 @@ const prop = defineProps({
 		type: Boolean,
 		default: () => false
 	},
-	checkFunc: {
-		type: Function,
-		default: () => () => {}
+	disabled: {
+		type: Boolean,
+		default: () => false
 	}
 })
 const checked = ref([false])
-checked.value[0] = prop.agreed ? '1' : ''
 const emit = defineEmits(['update:agreed'])
 const instance = getCurrentInstance()
 const { $Router } = instance.proxy
+watchEffect(() => {
+	checked.value[0] = prop.agreed ? '1' : ''
+})
 
 const handleAgree = () => {
 	$Router.push({ path: '/pages/statement/index' })
 }
 const handleAgreeCheck = () => {
+	if (prop.disabled) return
 	checked.value[0] = checked.value[0] === '1' ? '' : '1'
+	emit('update:agreed', !!checked.value[0])
 }
 const handleChange = () => {
+	checked.value[0] = checked.value[0] === '1' ? '' : '1'
 	emit('update:agreed', !!checked.value[0])
 }
 </script>

src/components/tabbar/tabbar.vue

@@ -6,6 +6,7 @@
 		:safeAreaInsetBottom="true"
 		:fixed="true"
 		:border="false"
+		v-bind="$attrs"
 	>
 		<block v-for="item in tabbarList" :key="item.path">
 			<u-tabbar-item
@@ -31,17 +32,12 @@
 </template>
 
 <script setup>
-import store from '@/store/index.js'
-import { useRoute } from '@/utils/uni-router'
-
 uni.hideTabBar()
-const route = useRoute()
 const instance = getCurrentInstance()
-const { $assets } = instance.proxy
-const userStore = store.useUserStore()
-const userInfo = computed(() => userStore.userInfo)
-
-const tabbarList = ref([
+const { $assets, $Router, $Route, $store } = instance.proxy
+const tabbarList = ref([])
+const List = {
+	simple: [
 		{
 			text: '首页',
 			icon: '/tabbar/home.png',
@@ -66,14 +62,40 @@ const tabbarList = ref([
 			name: 'personal',
 			show: true
 		}
-])
-const activeItem = computed(() => {
-	return route.meta.key
+	],
+	common: [
+		{
+			text: '首页',
+			icon: '/tabbar/order.png',
+			activeIcon: '/tabbar/order-sel.png',
+			path: '/pages/index/order/index',
+			name: 'order',
+			show: true
+		},
+		{
+			text: '我的',
+			icon: '/tabbar/my.png',
+			activeIcon: '/tabbar/my-sel.png',
+			path: '/pages/index/personal/index',
+			name: 'personal',
+			show: true
+		}
+	]
+}
+
+const activeItem = ref($Route.meta.key || 'home')
+watchEffect(() => {
+	const roleName = $store.user.roleName
+	if (activeItem.value === 'home' && roleName === 'common') {
+		activeItem.value = 'order'
+	}
+	tabbarList.value = List[roleName]
 })
 </script>
 
 <style lang="scss" scoped>
 .u-tabbar-item__icon {
+	margin-top: 10rpx;
 	width: 48rpx;
 	height: 48rpx;
 	object-fit: contain;

src/components/upload-img/upload-img.vue

@@ -4,11 +4,12 @@
 		@delete="deletePic"
 		accept="image"
 		uploadIconColor="#999"
-		v-bind="omit($attrs, ['disabled', 'maxCount', 'maxSize'])"
+		v-bind="omit($attrs, ['maxCount', 'maxSize'])"
 		:fileList="fileList"
 		:deletable="!$attrs.disabled"
 		:maxSize="10 * 1024 * 1024"
 		:maxCount="$attrs.disabled ? fileList.length : $attrs.maxCount"
+		@clickPreview="clickPreview"
 	/>
 </template>
 
@@ -23,11 +24,21 @@ const props = defineProps({
 		default: () => []
 	}
 })
-const fileList = ref(props.modelValue)
+const fileList = ref([])
+watchEffect(() => {
+	fileList.value = props.modelValue
+})
 // 删除图片
 const deletePic = (event) => {
 	fileList.value.splice(event.index, 1)
-	emits('update:modelValue', fileList.value)
+	emits(
+		'update:modelValue',
+		fileList.value.map((item) => ({
+			size: item.size,
+			type: item.type,
+			url: item.url
+		}))
+	)
 }
 
 // 新增图片
@@ -58,7 +69,18 @@ const afterRead = async (event) => {
 			: fileList.value.splice(fileListLen, 1)
 		fileListLen++
 	}
-	emits('update:modelValue', fileList.value)
+	emits(
+		'update:modelValue',
+		fileList.value.map((item) => ({
+			size: item.size,
+			type: item.type,
+			url: item.url
+		}))
+	)
+}
+
+const clickPreview = (item) => {
+	console.log('🚀 ~ file: upload-img.vue:83 ~ item:', item)
 }
 </script>
 <style lang="scss" scoped>

src/configs/index.js

@@ -10,7 +10,8 @@ export const primaryColor = '#FF8CA6'
 // 项目基础路径
 export const appBasePath = isProduction ? './' : './'
 // 请求地址
-export const requestURL = 'http://192.168.2.155:7788/hospital/app'
+// export const requestURL = 'http://192.168.2.121:7788/hospital/app'
+export const requestURL = 'https://peizhen.flameby.com/hospital/app'
 export const requestPath = ''
 export const requestFilePath = '/file'
 // 是否开启代理

src/manifest.json

@@ -43,11 +43,13 @@
 	"quickapp": {},
 	"mp-weixin": {
 		"appid": "wx55ff808ba0e28b1d",
+		"libVersion": "3.1.5",
 		"setting": {
 			"urlCheck": false,
 			"ignoreUploadUnusedFiles": false,
 			"ignoreDevUnusedFiles": false
 		},
+		"optimization": { "subPackages": true },
 		"usingComponents": true,
 		"permission": {
 			"scope.userLocation": {

src/pages.json

@@ -83,6 +83,13 @@
           "style": {
             "navigationBarTitleText": "订单完成"
           }
+        },
+        {
+          "path": "search",
+          "aliasPath": "/search",
+          "style": {
+            "navigationBarTitleText": ""
+          }
         }
       ]
     },
@@ -149,6 +156,15 @@
       ]
     }
   ],
+  "preloadRule": {
+    "pages/index/home/index": {
+      "network": "all",
+      "packages": [
+        "pages/form",
+        "pages/other"
+      ]
+    }
+  },
   "tabBar": {
     "list": [
       {
@@ -167,9 +183,6 @@
     "navigationBarTitleText": "",
     "navigationBarBackgroundColor": "#FF8CA6",
     "backgroundColor": "#ffffff",
-    "usingComponents": {
-      "van-rate": "/wxcomponents/vant-weapp/rate",
-      "van-icon": "/wxcomponents/vant-weapp/icon"
-    }
+    "usingComponents": {}
   }
 }

src/pages/contact/index.vue

@@ -11,12 +11,10 @@
 </template>
 
 <script>
-import wechatImage from '@/assets/image-wechat.png'
 
 export default {
 	data() {
 		return {
-			wechatImage
 		}
 	},
 	computed: {},

src/pages/form/complete.vue

@@ -1,39 +1,135 @@
 <template>
 	<view class="h-full bg-white px-24rpx">
-		<view class="mt-20rpx mb-20rpx text-34rpx">上传工作记录</view>
-		<upload-img v-model:fileList="fileList" multiple :maxCount="10" />
-		<view class="text-24rpx text-#666 mt-20rpx"
+		<view class="mt-20rpx mb-20rpx text-34rpx"
+			>{{ roleName === 'common' ? '上传' : '陪诊师' }}工作记录</view
+		>
+		<view class="h-220rpx">
+			<upload-img
+				width="220rpx"
+				height="220rpx"
+				v-model="fileList"
+				multiple
+				:maxCount="10"
+				:disabled="roleName !== 'common' || isView"
+			/>
+		</view>
+		<view v-if="roleName === 'common'" class="text-24rpx text-#666 mt-20rpx"
 			>请上传陪诊工作中的照片，建议一个环节一张照片</view
 		>
-		<view class="mt-40rpx mb-20rpx text-34rpx">填写备注</view>
+		<view class="mt-40rpx mb-20rpx text-34rpx">{{
+			roleName === 'common' ? '填写备注' : '陪诊师留言'
+		}}</view>
 		<u--textarea
 			v-model="remark"
 			placeholder=""
 			maxlength="300"
-			count
 			:autoHeight="false"
+			:disabled="roleName !== 'common' || isView"
+			count
 		/>
+		<block v-if="false && (roleName !== 'common' || isView)">
+			<view class="mt-40rpx mb-40rpx text-34rpx"
+				>{{ roleName !== 'common' && !isView ? '为' : '' }}陪诊师打分</view
+			>
+			<u-rate
+				size="30"
+				v-model="rate"
+				activeIcon="heart-fill"
+				inactiveIcon="heart"
+				activeColor="#FF8CA6"
+				:readonly="isView"
+			></u-rate>
+		</block>
 
 		<view
+			v-if="!isView"
 			class="fixed bottom-8 left-0 right-0 text-white pt-12rpx border-t-1px border-solid border-#E5E5E5"
 			><view
+				@click="handleSubmit"
 				class="bg-#FF8CA6 rounded-24rpx w-660rpx h-80rpx text-center leading-80rpx hover:shadow-md mx-auto"
-				>订单已完成，提交工作记录</view
+				>{{ roleName === 'common' ? '订单已完成，提交工作记录' : '完成' }}</view
 			></view
 		>
 	</view>
 </template>
 
 <script setup>
+const instance = getCurrentInstance()
+const { $api, $store, $Route, $Router, $toast, $dialog } = instance.proxy
 const fileList = ref([])
 const remark = ref('')
+const rate = ref(0)
+const roleName = computed(() => $store.user.userInfo.roleName)
+const orderId = $Route.query.id
+const isView = ref($Route.query.isEvaluate === 0)
+
+const getOrderComentInfo = () => {
+	$api.orderComentInfo({ orderId }).then(({ data, success }) => {
+		if (data && success) {
+			fileList.value = data.images
+				? data.images.split(',').map((item) => ({ url: item }))
+				: []
+			rate.value = data.level
+			remark.value = data.remark
+		}
+	})
+}
+
+const init = () => {
+	if (roleName.value !== 'common') {
+		uni.setNavigationBarTitle({
+			title: '服务评价'
+		})
+	}
+	getOrderComentInfo()
+}
+init()
+const handleSubmit = () => {
+	const isCommon = roleName.value === 'common'
+	console.log('🚀 ~ file: complete.vue:77 ~ fileList.value:', fileList.value)
+	if (fileList.value.length === 0) {
+		$toast('请上传照片')
+		return
+	} else if (remark.value.length === 0) {
+		$toast('请填写备注')
+		return
+	} else if (rate.value === 0) {
+		// $toast('请为陪诊师打分')
+		// return
+	}
+	$dialog(isCommon ? '确认提交工作记录？' : '确认提交？', {
+		showCancelButton: true,
+		confirmButtonText: '确定',
+		cancelButtonText: '取消',
+		confirmColor: '#FF8CA6'
+	}).then(() => {
+		$api
+			.orderComentSubmit({
+				orderId,
+				images: fileList.value.map((item) => item.url).join(','),
+				remark: remark.value,
+				level: isCommon ? null : rate.value,
+				roleName: roleName.value
+			})
+			.then((res) => {
+				if (res.success) {
+					$toast('提交成功').then(() => {
+						$Router.back()
+					})
+				}
+			})
+	})
+}
 </script>
 
 <style lang="scss" scoped>
 :deep {
-	.u-textarea,
+	.u-textarea {
+		height: 240rpx;
+		&,
 		.u-textarea__count {
 			background-color: #f2f2f2 !important;
 		}
+	}
 }
 </style>

src/pages/form/index.vue

@@ -1,7 +1,20 @@
 <template>
 	<view>
-		<view class="px-24rpx py-20rpx bg-[f2f2f2] min-h-[calc(100vh-230rpx)]">
-			<view class="rounded-16rpx bg-#fff pt-24rpx pb-16rpx">
+		<u-notify
+			:ref="(el) => (uNotify = el)"
+			message="支付成功！"
+			type="success"
+			bgColor="#EF8CA6"
+			:show="true"
+			safeAreaInsetTop
+		/>
+		<view
+			class="px-24rpx pt-20rpx pb-30rpx bg-[f2f2f2] min-h-[calc(100vh-230rpx)]"
+		>
+			<view
+				v-if="roleName === 'simple'"
+				class="rounded-16rpx bg-#fff pt-24rpx pb-16rpx"
+			>
 				<view class="flex items-center">
 					<view
 						class="relative flex-1 flex-col items-center flex"
@@ -57,9 +70,12 @@
 					:rules="rules"
 					ref="formRef"
 					borderBottom
-					errorType="border-bottom"
+					errorType="toast"
 					labelWidth="auto"
 				>
+					<!-- :labelStyle="{
+						padding: '12rpx 0'
+					}" -->
 					<u-form-item
 						v-for="item in formList"
 						:key="item.key"
@@ -79,7 +95,7 @@
 						<!-- model[item.key] ? item.type === 'date' ? $u.timeFormat(model[item.key], 'yyyy-mm-dd') : model[item.key] : item.placeholder -->
 						<view
 							v-else
-							@click="item.show = true"
+							@click="item.show = current === 1 ? true : false"
 							class="w-full text-right u-line-1 pl-2"
 							:class="item.val ? '' : 'text-#C0C4CC'"
 							>{{ item.val || item.placeholder }}
@@ -101,9 +117,9 @@
 					>
 					<upload-img
 						v-model="fileList"
-						disabled
-						multiple
+						:disabled="current > 1 || roleName === 'common'"
 						:maxCount="10"
+						multiple
 					></upload-img>
 				</view>
 				<view class="mt-22rpx mb-20rpx text-28rpx">备注</view>
@@ -111,6 +127,7 @@
 					v-model="model.remark"
 					placeholder=""
 					maxlength="300"
+					:disabled="current > 1 || roleName === 'common'"
 					count
 					:autoHeight="false"
 				/>
@@ -123,7 +140,10 @@
 					3. 服务地点为必填项
 					<br />
 				</view>
-				<agreed-comp v-model:agreed="agreed" />
+				<agreed-comp
+					v-model:agreed="agreed"
+					:disabled="current > 1 || roleName === 'common'"
+				/>
 			</view>
 
 			<u-picker
@@ -134,19 +154,21 @@
 				@confirm="onPickerConfirm"
 				@cancel="show = false"
 				@close="handleShowPicker"
+				:defaultIndex="[curType - 1]"
 				cancelText="取消"
 				confirmColor="#FF8CA6"
 				closeOnClickOverlay
 			></u-picker>
 			<block v-for="item in dateAndSelectFormList" :key="item.key">
+				<!-- :minHour="item.type === 'time' ? new Date().getHours() : 0"
+					:minMinute="item.type === 'time' ? new Date().getMinutes() : 0" -->
 				<u-datetime-picker
 					v-if="item.type === 'date' || item.type === 'time'"
-					v-model="model[item.key]"
+					:modelValue="model[item.key]"
 					:show="item.show"
 					:mode="item.type"
 					:minDate="item.type === 'date' ? new Date().getTime() : 0"
-					:minHour="item.type === 'time' ? new Date().getHours() : 0"
-					:minMinute="item.type === 'time' ? new Date().getMinutes() : 0"
+					:filter="item.type === 'time' ? filterFun : null"
 					@confirm="onDatePickerConfirm($event, item)"
 					@cancel="item.show = false"
 					@close="item.show = false"
@@ -189,36 +211,77 @@
 		</view>
 		<button-contact />
 		<view
-			class="bg-#fff h-150rpx w-full sticky bottom-0 flex justify-between items-center pr-24rpx pl-40rpx pb-48rpx rounded-sm"
+			v-if="
+				((roleName === 'common' && !orderInfo.reasonId) ||
+					(roleName === 'simple' && !orderInfo.userReasonId)) &&
+				showFlag
+			"
+			class="bg-#fff h-150rpx w-full sticky bottom-0 z-2 flex justify-between items-center pr-24rpx pl-40rpx pb-48rpx rounded-sm"
 		>
-			<block v-if="true">
-				<view>
+			<block v-if="orderInfo.status < 3 || !orderId || roleName === 'common'">
+				<view class="" v-if="orderInfo.receiveStatus !== 0">
+					<text v-if="roleName === 'common'">预估收入</text>
 					<text class="text-32rpx">￥</text>
-					<text class="font-bold text-54rpx">{{
-						typeSelItem.price || 198
+					<text class="font-bold text-54rpx" v-if="roleName === 'common'">
+						{{ orderInfo.doctorPrice }}
+					</text>
+					<text class="font-bold text-54rpx" v-else>{{
+						orderInfo.orderPrice || selTypeItem.price || 0
 					}}</text>
 				</view>
 				<view
-					@click="onSubmit"
+					v-if="orderInfo.status === 2 && roleName === 'simple'"
+					@click="$u.throttle(orderPay, 1000)"
+					class="text-white mr-4 bg-#FF8CA6 rounded-24rpx w-240rpx h-80rpx text-center leading-80rpx hover:shadow-md"
+					>支付</view
+				>
+				<view
+					v-if="!orderId && roleName === 'simple'"
+					@click="$u.throttle(onSubmit, 1000)"
 					class="text-white bg-#FF8CA6 rounded-24rpx w-240rpx h-80rpx text-center leading-80rpx hover:shadow-md"
 					>立即下单</view
 				>
 			</block>
 			<view
-				v-if="false"
+				v-if="roleName === 'common'"
+				@click="
+					$u.throttle(
+						handleOrder.bind(
+							null,
+							orderInfo.receiveStatus !== 0 ? 'start' : 'end'
+						),
+						1000
+					)
+				"
+				class="text-white bg-#FF8CA6 w-240rpx rounded-24rpx mx-30rpx h-80rpx text-center leading-80rpx hover:shadow-md"
+				:class="orderInfo.receiveStatus === 0 && 'w-full'"
+				>{{
+					orderInfo.receiveStatus !== 0
+						? '开始服务'
+						: '订单已完成，提交工作记录'
+				}}</view
+			>
+			<view
+				v-if="roleName === 'simple' && orderInfo.status > 2"
+				@click="$u.throttle(handleOrder.bind(null, 'end'), 500)"
 				class="text-white bg-#FF8CA6 rounded-24rpx w-full mx-30rpx h-80rpx text-center leading-80rpx hover:shadow-md"
-				>{{ true ? '开始服务' : '订单已完成，提交工作记录' }}</view
+				>{{
+					orderInfo.status === 3
+						? '订单已提交，请耐心等待'
+						: orderInfo.isEvaluate === 0
+						? '查看记录'
+						: '服务完成，请评价'
+				}}</view
 			>
 		</view>
 	</view>
 </template>
 
 <script setup>
-import { useRoute } from '@/utils/uni-router'
-
-const route = useRoute()
 const instance = getCurrentInstance()
-const { $u, $api, $Router, $Dialog } = instance.proxy
+const { $u, $api, $Router, $Route, $dialog, $toast, $store, $loading } =
+	instance.proxy
+const roleName = computed(() => $store.user.userInfo.roleName)
 // 填写订单 在线支付 服务中 服务完成
 const list = ref([
 	{ label: '填写订单', id: 1 },
@@ -228,16 +291,8 @@ const list = ref([
 ])
 const current = ref(1)
 const show = ref(false)
-const fileList = ref([
-	{
-		message: '',
-		size: 20042,
-		// status: 'success',
-		thumb: 'http://tmp/Y2K3DucvbS0Aa23b6ba2697baa86a0eb579485736a6a.jpeg',
-		type: 'image',
-		url: 'https://xjl559.oss-cn-shanghai.aliyuncs.com/2023/12/08/3d4a506c74a145ba_Y2K3DucvbS0Aa23b6ba2697baa86a0eb579485736a6a.jpeg'
-	}
-])
+const showFlag = ref(false)
+const fileList = ref([])
 // 半天陪诊 全天陪诊 代办约号 取送报告 代取送药 上门护理
 const columns = reactive([
 	[
@@ -252,38 +307,41 @@ const columns = reactive([
 // 就诊医院 请输入, 预约就诊日期 请选择就诊日期,预约就诊时间 请选择就诊时间,就诊人,请填写就诊人,联系人 请填写就诊联系人,联系人手机号 请填写就诊联系人 ,挂号科室
 const formItems = [
 	{
-		label: '收货地址',
-		placeholder: '请输入收货地址',
+		label: '收件地址',
+		placeholder: '请输入收件地址',
 		key: 'deliveryAddress',
 		required: true,
 		type: 'string',
 		trigger: ['blur', 'change'],
-		message: '请填写收货地址',
+		message: '请填写收件地址',
 		show: true,
 		cur: [4, 5],
 		sort: 1
 	},
 	{
 		label: '就诊医院',
-		placeholder: '请输入',
+		placeholder: '请选择就诊医院',
 		key: 'hospitalId',
+		keyName: 'hospitalName',
 		required: true,
 		type: 'select',
 		trigger: ['blur', 'change'],
-		message: '请填写就诊医院',
+		message: '请选择就诊医院',
 		show: false,
 		cur: [1, 2, 3, 4, 5],
 		sort: 2
 	},
 	{
-		label: '上门护理',
-		placeholder: '请选择上门护理类型',
-		key: 'hospitalId',
+		label: '护理项目',
+		placeholder: '请选择护理项目',
+		key: 'typeId',
+		keyName: 'typeName',
 		required: true,
-		type: 'checkbox',
+		type: 'select',
 		trigger: ['blur', 'change'],
-		message: '请选择上门护理类型',
+		message: '请选择护理项目',
 		show: false,
+		options: [],
 		cur: [6],
 		sort: 1
 	},
@@ -303,6 +361,7 @@ const formItems = [
 		label: '报告类型',
 		placeholder: '请选择报告类型',
 		key: 'reportType',
+		keyName: 'reportTypeName',
 		required: true,
 		type: 'select',
 		trigger: ['blur', 'change'],
@@ -321,7 +380,7 @@ const formItems = [
 		message: '请选择预约就诊日期',
 		show: false,
 		sort: 3,
-		cur: [1, 2]
+		cur: [1, 2, 3]
 	},
 	{
 		label: '预约就诊时间',
@@ -333,7 +392,7 @@ const formItems = [
 		trigger: ['blur', 'change'],
 		show: false,
 		sort: 4,
-		cur: [1, 2]
+		cur: [1, 2, 3]
 	},
 	{
 		label: '上门日期',
@@ -369,19 +428,7 @@ const formItems = [
 		message: '请填写就诊人',
 		show: true,
 		sort: 5,
-		cur: [1, 2]
-	},
-	{
-		label: '就诊人',
-		placeholder: '请填写就诊人',
-		key: 'treatmenter',
-		required: true,
-		type: 'string',
-		trigger: ['blur', 'change'],
-		message: '请填写就诊人',
-		show: true,
-		sort: 5,
-		cur: [5]
+		cur: [1, 2, 3, 5]
 	},
 	{
 		label: '联系人',
@@ -393,7 +440,7 @@ const formItems = [
 		message: '请填写联系人',
 		show: true,
 		sort: 6,
-		cur: [1, 2, 6]
+		cur: [1, 2, 3, 4, 6]
 	},
 	{
 		label: '联系人手机号',
@@ -405,7 +452,7 @@ const formItems = [
 		message: '请填写联系人手机号',
 		show: true,
 		sort: 7,
-		cur: [1, 2, 4, 5, 6]
+		cur: [1, 2, 3, 4, 5, 6]
 	},
 	{
 		label: '挂号科室',
@@ -417,7 +464,7 @@ const formItems = [
 		message: '请选择挂号科室',
 		show: true,
 		sort: 8,
-		cur: [1, 2]
+		cur: [1, 2, 3]
 	}
 	// {
 	// 	label: '备注',
@@ -428,15 +475,24 @@ const formItems = [
 	// 	show: true
 	// }
 ]
+const uNotify = ref(null)
+const formRef = ref(null)
 const dateAndSelectFormList = ref()
 const formList = ref()
 const model = ref({})
-const typeSelItem = ref({}) //选择的服务项目
-const curType = ref(route.query.cur ? +route.query.cur : columns[0][0].id)
+const curType = ref($Route.query.cur ? +$Route.query.cur : columns[0][0].id)
 const typeVal = ref('')
+const selTypeItem = ref({})
 const rules = ref({})
-const agreed = ref(true)
+const agreed = ref(false)
 const hospitalList = ref([])
+const serverTypelList = ref([])
+const reportTypelList = ref([])
+const dateKeyObj = {}
+const orderId = ref($Route.query.id ? +$Route.query.id : '')
+const hospitaId = ref($Route.query.hospitaId ? +$Route.query.hospitaId : '')
+const hospitaName = ref($Route.query.hospitaName || '')
+const orderInfo = ref({})
 
 const getPzList = async () => {
 	const res = await $api.fetchPzServerList()
@@ -444,38 +500,223 @@ const getPzList = async () => {
 }
 
 const getPzHospitalList = async () => {
-	const res = await $api.fetchPzHospitalList()
-	hospitalList.value = (res?.page?.list || []).map((item) => ({
+	const res = await $api.fetchPzHospitalList({ name: '' })
+	hospitalList.value = (res?.list || []).map((item) => ({
 		label: item.name,
-		id: item.id
+		id: item.id + ''
 	}))
 }
+const getServerTypeList = async () => {
+	const res = await $api.fetchServerTypeList()
+	serverTypelList.value = (res?.data || []).map((item) => ({
+		label: item.name,
+		id: item.id + ''
+	}))
+}
+const getReportTypelList = async () => {
+	const res = await $api.fetchReportTypelList()
+	reportTypelList.value = (res?.data || []).map((item) => ({
+		label: item.name,
+		id: item.id + ''
+	}))
+}
+const getOrderInfo = async () => {
+	if (!orderId.value) return (showFlag.value = true)
+	$loading(true)
+	const res = await $api.orderInfo({ id: orderId.value })
+	if (res.success) {
+		const { order = {} } = res
+		orderInfo.value = order
+		curType.value = order.serverId
+		current.value = order.status || 1
+		agreed.value = true
+	}
+	showFlag.value = true
+	$loading(false)
+}
 
-getPzList()
-getPzHospitalList()
+const init = () => {
+	getPzList()
+	getPzHospitalList()
+	if (!roleName.value) {
+		$dialog('请先登录', {
+			showCancelButton: true,
+			confirmButtonText: '去登录',
+			cancelButtonText: '取消',
+			confirmColor: '#FF8CA6'
+		})
+			.then(() => {
+				$Router.push('/personal')
+			})
+			.catch(() => $Router.push('/'))
+		return
+	}
+	getServerTypeList()
+	getReportTypelList()
+	getOrderInfo()
+}
+
+init()
+
+const orderPay = async () => {
+	const res = await $api.orderPay({
+		orderId: orderId.value || model.value.contactPhone
+	})
+	if (res?.success) {
+		const { timeStamp, nonce_str, prepay_id, signType = 'MD5', sign } = res
+		uni.requestPayment({
+			provider: 'wxpay', // 支付宝支付：alipay，微信支付：wxpay
+			timeStamp,
+			nonceStr: nonce_str,
+			package: prepay_id,
+			signType,
+			paySign: sign,
+			success: function (res) {
+				// 在这里处理支付成功的回调
+				// console.log(res)
+				$toast('支付成功!', {
+					icon: 'success',
+					mask: true,
+					duration: 3 * 1000
+				})
+				getOrderInfo()
+			},
+			fail: function (err) {
+				// 处理支付失败的回调
+				console.error(err.errMsg)
+				getOrderInfo()
+				if (err.errMsg === 'requestPayment:fail cancel') {
+					$toast('支付取消！', {
+						icon: 'error',
+						duration: 2 * 1000
+					})
+				}
+			}
+		})
+	}
+}
 
 const onSubmit = () => {
-	console.log('submit', fileList.value)
+	// uNotify.value?.show({
+	// 	top: 10,
+	// 	type: 'success',
+	// 	color: '#fff',
+	// 	bgColor: '#FF8CA6',
+	// 	message: '支付成功! 等待系统分配陪诊师中...',
+	// 	duration: 1000 * 3,
+	// 	fontSize: 20,
+	// 	safeAreaInsetTop: true
+	// })
+	formRef.value.validate().then(async () => {
+		if ([4, 5].includes(curType.value)) {
+			if (fileList.value.length)
+				model.value.pictureUrl = JSON.stringify(fileList.value)
+			else {
+				$toast(`请上传${curType.value === 5 ? '挂号' : '取报告'}凭证!`)
+				return
+			}
+		}
+		const { date, time } = dateKeyObj
+		if (time && date) {
+			const selDate = `${model.value[date]}T${model.value[time]}:00`
+			if (new Date(selDate) < new Date()) {
+				$toast('选择时间不能小于当前时间！', {
+					type: 'error',
+					duration: 2 * 1000
+				})
+				return
+			}
+		}
+		if (!agreed.value) {
+			try {
+				await $dialog('是否已阅读并同意《服务条款》?', {
+					showCancelButton: true,
+					confirmButtonText: '同意',
+					cancelButtonText: '取消',
+					confirmColor: '#FF8CA6'
+				})
+				agreed.value = true
+			} catch (error) {
+				return
+			}
+		}
+		// $loading(true)
+		model.value.serverId = curType.value
+		const { success, order } = await $api.orderCreate(model.value)
+		if (success) {
+			orderId.value = order.id
+			orderInfo.value = order
+			orderPay()
+			$toast('提交订单成功!')
+		}
+	})
+}
+
+const handleOrder = async (type) => {
+	if (type === 'start') {
+		$dialog('确认开始服务吗？', {
+			showCancelButton: true,
+			confirmButtonText: '确定',
+			cancelButtonText: '取消',
+			confirmColor: '#FF8CA6'
+		})
+			.then(async () => {
+				const res = await $api.startOrder({
+					id: orderId.value
+				})
+				if (res.success) {
+					getOrderInfo()
+					$toast('开始服务成功!', { duration: 3000 })
+				}
+			})
+			.cahch(() => '')
+	} else if (type === 'end') {
+		if (orderInfo.value.status === 4) {
+			$Router.push({
+				path: '/complete',
+				query: { id: orderId.value, isEvaluate: orderInfo.value.isEvaluate }
+			})
+		}
+	}
 }
 
 watchEffect(() => {
-	const item = columns[0].find((item) => item.id === curType.value)
+	const cur = curType.value
+	const item = columns[0].find((item) => item.id === cur)
 	typeVal.value = item?.serveName
+	selTypeItem.value = item || {}
 	dateAndSelectFormList.value = []
 	formList.value = []
 	formItems.forEach((item) => {
-		const { required, key, message, trigger, type } = item
-		if (item.cur.includes(curType.value)) {
-			if (item.key === 'hospitalId') item.options = [hospitalList.value]
+		const { required, key, keyName, message, trigger, type } = item
+		if (item.cur.includes(cur)) {
+			if (key === 'hospitalId') {
+				item.options = [hospitalList.value]
+				model.value.hospitalId = hospitaId.value
+				item.val = hospitaName.value
+			} else if (key === 'typeId') item.options = [serverTypelList.value]
+			else if (key === 'reportType') item.options = [reportTypelList.value]
 			formList.value.push(item)
-			// if (['date', 'time', 'select'].includes(type)) {
-			if (item.type !== 'string') {
+			if (type !== 'string') {
 				dateAndSelectFormList.value.push(item)
 			}
-		}
 			rules.value[item.key] = { required, message, trigger }
+			if (orderInfo.value.result) {
+				item.val = model.value[key] = orderInfo.value.result[key]
+				if (keyName) {
+					item.val = orderInfo.value.result[keyName] || ''
+				}
+			} else {
 				model.value[key] = ''
+				if (type === 'time') model.value[key] = `${new Date().getHours()}:00`
+				if (type === 'date' || type === 'time') dateKeyObj[type] = key
+			}
+		}
 	})
+	if (typeof orderInfo.value.result?.pictureUrl === 'string') {
+		fileList.value = JSON.parse(orderInfo.value.result.pictureUrl)
+	}
+	model.value.remark = orderInfo.value?.result?.remark || ''
 })
 
 const handleShowPicker = () => {
@@ -488,7 +729,6 @@ const onPickerConfirm = ({ value: [val] }) => {
 	show.value = false
 	typeVal.value = val.serveName
 	curType.value = val.id
-	typeSelItem.value = val
 }
 // 列表选择器
 const onSelectPickerConfirm = ({ value: [val] } = { value: [] }, item) => {
@@ -498,14 +738,19 @@ const onSelectPickerConfirm = ({ value: [val] } = { value: [] }, item) => {
 }
 const onDatePickerConfirm = ({ value }, item) => {
 	item.show = false
-	if (item.type === 'date') {
+	if (item.type === 'date')
 		item.val = model.value[item.key] = $u.timeFormat(value, 'yyyy-mm-dd')
-	} else item.val = model.value[item.key] = value
+	else item.val = model.value[item.key] = value
 }
 // 护理项目点击
 const onCheckboxChange = (val, item) => {
 	model.value[item.key] = val
-	item.val = val.join(',')
+	item.val = val
+}
+
+const filterFun = (type, value) => {
+	if (type === 'minute') return value.filter((item) => item % 15 === 0)
+	return value
 }
 </script>
 

src/pages/form/search.vue

@@ -0,0 +1,64 @@
+<template>
+	<view class="h-full relative px-24rpx bg-#fff">
+		<view class="fixed top-0 left-0 right-0 px-24rpx bg-#fff">
+			<u-search
+				v-model="searchVal"
+				@change="$u.debounce(handleChange, 1000)"
+				@search="$u.debounce(handleChange, 300)"
+				shape="square"
+				margin="20rpx 0rpx 30rpx 0rpx"
+				height="80rpx"
+				searchIconSize="48rpx"
+				:showAction="false"
+				:searchIcon="$assets('/sou.png')"
+				placeholderColor="#666"
+				placeholder="搜索您需要陪诊的医院"
+				clearabled
+				focus
+			/>
+		</view>
+		<view class="pt-130rpx pb-80rpx">
+			<view
+				v-for="item in dataList"
+				:key="item.id"
+				class="flex items-center justify-between px-30rpx py-20rpx text-#000 border-border-black border-b border-solid"
+				@click="
+					$Router.push({
+						path: '/form',
+						query: { hospitaId: item.id, hospitaName: item.name }
+					})
+				"
+			>
+				<view class="">
+					{{ item.name }}
+				</view>
+				<view
+					class="text-white bg-#FF8CA6 rounded-24rpx px-30rpx py-10rpx text-center hover:shadow-md"
+				>
+					选择
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script setup>
+const instance = getCurrentInstance()
+const { $api } = instance.proxy
+const searchVal = ref('')
+const dataList = ref([])
+
+const handleChange = async () => {
+	const { list = [] } = await $api.fetchPzHospitalList({
+		name: searchVal.value.trim()
+	})
+	dataList.value = list
+}
+</script>
+
+<style lang="scss" scoped>
+:deep {
+	.u-search__content {
+		border-radius: 16rpx !important;
+	}
+}
+</style>

src/pages/index/home/index.vue

@@ -1,7 +1,8 @@
 <template>
-	<view class="px-24rpx bg-#fff">
+	<view class="px-24rpx bg-#fff" v-if="userRole === 'simple'">
 		<u-search
 			v-model="searchVal"
+			@click="$Router.push('/search')"
 			shape="square"
 			margin="20rpx 0rpx 30rpx 0rpx"
 			height="80rpx"
@@ -11,12 +12,13 @@
 			placeholderColor="#666"
 			placeholder="搜索您需要陪诊的医院"
 			clearabled
+			disabled
 		/>
 		<u-swiper
 			:list="swiperList"
 			height="200"
 			radius="24rpx"
-			keyName="image"
+			keyName="images"
 			indicatorMode="dot"
 			indicator
 			circular
@@ -40,11 +42,14 @@
 					}}</text>
 				</u-grid-item>
 			</u-grid>
+			<!-- right-30rpx -->
 			<button
-				class="absolute right-30rpx bottom-40rpx bg-transparent border-transparent z-2 w-120rpx h-150rpx"
+				class="absolute right-200rpx bottom-40rpx bg-transparent border-transparent z-2 w-120rpx h-150rpx"
 				open-type="contact"
+				hoverClass="none"
 			></button>
 		</view>
+		<view class="relative">
 			<u--image
 				width="702rpx"
 				height="180rpx"
@@ -54,7 +59,13 @@
 				:duration="300"
 				lazy-load
 			/>
-		<view class="mt-30rpx flex items-center h-180rpx mb-20rpx">
+			<button
+				class="absolute left-0 top-0 w-full h-full bg-transparent border-transparent z-2"
+				open-type="contact"
+				hoverClass="none"
+			></button>
+		</view>
+		<view v-if="false" class="mt-30rpx flex items-center h-180rpx mb-20rpx">
 			<u--image
 				:src="$assets('/tongzhi.png')"
 				:duration="300"
@@ -71,29 +82,31 @@
 				<u-icon name="arrow-right" width="48rpx" height="48rpx" />
 			</view>
 		</view>
-	</view>
 		<tabbar></tabbar>
+	</view>
+	<Order v-else />
 </template>
 
 <script setup>
-import { ref, getCurrentInstance } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+import Order from '../order/index.vue'
 
-const { $Router, $api } = getCurrentInstance().proxy
+const { $Router, $api, $store } = getCurrentInstance().proxy
+const userRole = computed(() => $store.user.userInfo.roleName ?? 'simple')
 const searchVal = ref('')
-const swiperList = ref([
-	{
-		image: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
-		title: '昨夜西风凋碧树'
-	},
-	{
-		image: 'https://cdn.uviewui.com/uview/swiper/2.jpg',
-		title: '行色匆匆'
-	},
-	{
-		image: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
-		title: '更上一层楼'
-	}
-])
+const swiperList = ref([])
+// {
+// 	images: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
+// 	title: '昨夜西风凋碧树'
+// },
+// {
+// 	images: 'https://cdn.uviewui.com/uview/swiper/2.jpg',
+// 	title: '行色匆匆'
+// },
+// {
+// 	images: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
+// 	title: '更上一层楼'
+// }
 // 半天陪诊 全天陪诊 遵享服务 代办约号 取送报告 代取送药 上门检测护理 在线咨询
 const gridList = ref([
 	{
@@ -112,14 +125,14 @@ const gridList = ref([
 			cur: 2
 		}
 	},
-	{
-		title: '遵享服务',
-		icon: '/home-icon/h-icon-3.png',
-		path: '/pages/form/index',
-		query: {
-			cur: ''
-		}
-	},
+	// {
+	// 	title: '遵享服务',
+	// 	icon: '/home-icon/h-icon-3.png',
+	// 	path: '/pages/form/index',
+	// 	query: {
+	// 		cur: ''
+	// 	}
+	// },
 	{
 		title: '代办约号',
 		icon: '/home-icon/h-icon-4.png',
@@ -167,6 +180,13 @@ const handleGridClick = (path, query = {}) => {
 		})
 	}
 }
+const getSwiperList = async () => {
+	const { list = [] } = await $api.fetchSwiperList()
+	swiperList.value = list
+}
+onShow(() => {
+	getSwiperList()
+})
 </script>
 
 <style lang="scss" scoped>

src/pages/index/order/index.vue

@@ -1,7 +1,7 @@
 <template>
-	<view class="min-h-600rpx">
-		<u-sticky bgColor="#fff">
-			<view v-if="true" class="px-24rpx pt-20rpx relative">
+	<z-paging-swiper>
+		<template #top>
+			<view v-if="roleName === 'common'" class="px-24rpx pt-20rpx relative">
 				<u--image
 					width="100%"
 					height="200rpx"
@@ -12,11 +12,13 @@
 					class="text-white flex items-center justify-between px-130rpx pt-20rpx absolute top-0 left-0 w-full h-full"
 				>
 					<view class="flex flex-col items-center">
-						<view class="text-64rpx">11</view>
+						<view class="text-64rpx">{{ orderTodayIncome.count || 0 }}</view>
 						<view class="text-34rpx">今日接单</view>
 					</view>
 					<view class="flex flex-col items-center">
-						<view class="text-64rpx">12323</view>
+						<view class="text-64rpx">{{
+							orderTodayIncome.doctorPrice || 0
+						}}</view>
 						<view class="text-34rpx">今日收入</view>
 					</view>
 				</view>
@@ -25,9 +27,10 @@
 				@change="handleTabChange"
 				class="w-full"
 				:list="list"
-				key="id"
 				lineWidth="30"
 				lineColor="#FF8CA6"
+				:scrollable="false"
+				:current="current"
 				:activeStyle="{
 					color: '#303133',
 					fontWeight: 'bold',
@@ -39,62 +42,146 @@
 				}"
 				itemStyle="width: 20%; height: 100rpx;"
 			></u-tabs>
-		</u-sticky>
-		<view class="px-24rpx pt-20rpx">
+		</template>
+		<swiper
+			class="h-full"
+			:current="current"
+			@animationfinish="swiperAnimationfinish"
+		>
+			<swiper-item v-for="(_, index) in list" :key="index">
+				<view class="h-full">
+					<z-paging
+						:ref="(el) => (paging[index] = el)"
+						v-if="dataList[index].show"
+						v-model="dataList[index].data"
+						@query="queryList"
+						:min-delay="300"
+					>
 						<view
-				v-for="item in 2"
-				:key="item"
-				class="min-h-410rpx bg-white rounded-16rpx px-20rpx py-30rpx mb-20rpx shadow-current"
+							v-for="(item, i) of dataList[index].data"
+							:key="i"
+							class="min-h-410rpx bg-white rounded-16rpx mx-30rpx px-20rpx py-30rpx mb-20rpx shadow-current"
 						>
 							<view class="flex-row-between">
-					<text class="text-#999 text-24rpx">订单号：22323232323</text>
+								<text class="text-#999 text-24rpx"
+									>订单号：{{ item.outTradeNo }}</text
+								>
 								<view
+									v-if="item.orderStatus !== null || item.status !== null"
 									class="w-124rpx h-48rpx leading-48rpx text-center rounded-sm text-24rpx"
-						:class="`${stateColorList[status].bg} ${stateColorList[status].color}`"
-						>{{ stateColorList[status].text }}</view
+									:class="`${stateColorList[item.orderStatus].bg} ${
+										stateColorList[item.orderStatus].color
+									}`"
+									>{{ stateColorList[item.orderStatus].text }}</view
 								>
 							</view>
-				<view class="flex-row-between text-28rpx text-#999 mt-20rpx">
-					<view>服务项目：<text class="text-#000">服务项目</text></view>
-					<view class="text-#FF3939 font-bold">预计收入：￥100</view>
+							<view
+								class="flex-row-between items-center text-28rpx text-#999 mt-20rpx"
+							>
+								<view
+									>服务项目：<text class="text-#000">{{
+										item.projectName
+									}}</text></view
+								>
+								<view
+									v-if="roleName === 'common'"
+									class="text-#FF3939 font-bold"
+									>预计收入：￥{{ item.doctorPrice || '' }}</view
+								>
 							</view>
 							<view
 								class="mt-10rpx mb-24rpx flex text-24rpx bg-#f2f2f2 w-full min-h-140rpx rounded-sm px-34rpx pt-20rpx pb-10rpx"
 							>
-					<view class="flex flex-col text-#666">
+								<view
+									v-if="item.result?.contact || item.result?.clinicPerson"
+									class="flex flex-col text-#666 mr-40rpx"
+								>
+									<block v-if="item.result?.clinicPerson">
 										<text>就诊人</text>
-						<text class="text-#000 mt-8rpx">就诊人</text>
+										<text class="text-#000 mt-8rpx">{{
+											item.result.clinicPerson
+										}}</text>
+									</block>
+									<block v-else-if="item.result?.contact">
+										<text>联系人</text>
+										<text class="text-#000 mt-8rpx">{{
+											item.result.contact
+										}}</text>
+									</block>
 								</view>
-					<view class="flex flex-col flex-1 pl-40rpx pr-20rpx text-#666">
-						<text>医院</text>
-						<text class="text-#000 mt-8rpx">医院医院医院医院医院</text>
+								<view class="flex flex-col flex-1 pr-20rpx text-#666">
+									<text v-if="item.result?.hospitalName">医院</text>
+									<text class="text-#000 mt-8rpx">{{
+										item.result?.hospitalName
+									}}</text>
 								</view>
 								<view class="flex flex-col text-#666">
 									<text>预约时间：</text>
-						<text class="text-#000 mt-8rpx">2023/02/02</text>
-						<text class="text-#000">10:00</text>
+									<text class="text-#000 mt-8rpx">{{
+										item.result?.clinicDate ||
+										item.result?.visitDate ||
+										item.result?.serviceTime
+									}}</text>
+									<text class="text-#000">{{
+										item.result?.clinicTime || item.result?.visitTime
+									}}</text>
 								</view>
 							</view>
 							<view class="flex justify-end items-center">
 								<view
-						@click="handleClick(item)"
-						class="btn text-30rpx px-30rpx py-14rpx ml-30rpx border-#40A0E4 text-#40A0E4"
-						>开始服务</view
+									v-if="
+										item.orderStatus === 4 &&
+										item.refundStatus !== 0 &&
+										roleName !== 'common'
+									"
+									@click="handleClick(item, 'refund')"
+									class="btn text-30rpx px-30rpx py-14rpx ml-30rpx border-#5F5F5F text-#5F5F5F"
+									>申请退款</view
 								>
 								<view
-						@click="handleClick(item)"
+									v-if="roleName === 'common' && item.orderStatus < 3"
+									@click="
+										$u.throttle(
+											() =>
+												handleClick(
+													item,
+													item.receiveStatus !== 0 ? 'start' : 'end'
+												),
+											800
+										)
+									"
+									class="btn text-30rpx px-30rpx py-14rpx ml-30rpx border-#40A0E4 text-#40A0E4"
+									>{{ item.receiveStatus !== 0 ? '开始' : '完成' }}服务</view
+								>
+								<view
+									v-if="roleName === 'common' && item.orderStatus === 3"
+									@click="$u.throttle(() => handleClick(item, 'end'), 800)"
+									class="btn text-30rpx px-30rpx py-14rpx ml-30rpx border-#40A0E4 text-#40A0E4"
+									>工作记录</view
+								>
+								<view
+									v-if="roleName !== 'common' && item.orderStatus === 3"
+									@click="$u.throttle(() => handleClick(item, 'end'), 800)"
+									class="btn text-30rpx px-30rpx py-14rpx ml-30rpx border-#40A0E4 text-#40A0E4"
+									>{{ item.isEvaluate !== 0 ? '去评价' : '查看记录' }}</view
+								>
+								<view
+									@click="$u.throttle(() => handleClick(item, 'detail'), 800)"
 									class="btn text-30rpx px-30rpx py-14rpx ml-30rpx border-#FF8CA6 text-#FF8CA6"
 									>查看详情</view
 								>
 								<view
-						@click="handleClick(item)"
+									v-if="!item.reasonId && item.orderStatus < 3"
+									@click="handleClick(item, 'cancel')"
 									class="btn text-30rpx px-30rpx py-14rpx ml-30rpx border-#5F5F5F text-#5F5F5F"
 									>取消订单</view
 								>
 							</view>
 						</view>
+					</z-paging>
 				</view>
-	</view>
+			</swiper-item>
+		</swiper>
 		<u-popup
 			class="overflow-hidden"
 			:show="popupShow"
@@ -102,22 +189,22 @@
 			@close="popupShow = false"
 			closeable
 		>
-		<view class="min-h-800rpx pt-90rpx relative">
+			<view class="pt-90rpx relative">
 				<view class="text-#000 absolute left-50rpx top-30rpx"
 					>请选择取消理由</view
 				>
 				<view
-				class="h-full w-full overflow-y-auto py-4 px-40rpx rounded-16rpx overflow-hidden"
+					class="h-full w-full overflow-y-auto py-10rpx px-40rpx rounded-16rpx overflow-hidden"
 				>
-				<u-radio-group v-model="value" placement="row" @change="groupChange">
+					<u-radio-group v-model="cancelVal" placement="row">
 						<u-radio
-						class="!mb-30rpx"
 							labelSize="16"
 							iconSize="20"
-						v-for="(item, index) in list"
+							v-for="(item, index) in reasonList"
+							:key="index"
 							activeColor="#FF8CA6"
-						:label="'思悠悠，恨悠悠，恨到归时方始休' + index"
-						:name="index"
+							:label="item.reason"
+							:name="item.id"
 						></u-radio>
 					</u-radio-group>
 					<view class="mt-20rpx mb-20rpx text-28rpx">其他理由，请填写</view>
@@ -129,6 +216,7 @@
 						:autoHeight="false"
 					/>
 					<view
+						@click="handleCancelSubmit"
 						class="text-white bg-#FF8CA6 rounded-24rpx w-full mx-auto mt-30rpx h-80rpx text-center leading-80rpx hover:shadow-md"
 						>提交</view
 					>
@@ -136,10 +224,16 @@
 			</view>
 		</u-popup>
 		<button-contact :class="`!bottom-16%`" />
-	<tabbar />
+		<template #bottom><tabbar :fixed="false" /></template>
+	</z-paging-swiper>
 </template>
 
 <script setup>
+import { onShow } from '@dcloudio/uni-app'
+
+const instance = getCurrentInstance()
+const { $api, $store, $Router, $toast, $dialog } = instance.proxy
+const roleName = computed(() => $store.user.userInfo.roleName)
 // 全部 待服务 进行中 已完成 已取消
 const list = ref([
 	{ name: '全部', id: 0 },
@@ -148,11 +242,27 @@ const list = ref([
 	{ name: '已完成', id: 3 },
 	{ name: '已取消', id: 4 }
 ])
+const paging = ref([])
+const dataList = ref([
+	{ data: [], show: true },
+	{ data: [], show: false },
+	{ data: [], show: false },
+	{ data: [], show: false },
+	{ data: [], show: false }
+])
 const popupShow = ref(false)
-const value = ref(0)
+const cancelVal = ref()
 const remark = ref('')
-const status = ref(Math.floor(Math.random() * 4))
+const status = ref(0)
+const current = ref(0)
+const outTradeNo = ref('')
+const reasonList = ref([])
 const stateColorList = [
+	{
+		text: '待支付',
+		color: 'text-#fff',
+		bg: 'bg-primary-500'
+	},
 	{
 		text: '待服务',
 		color: 'text-#01BB88',
@@ -174,16 +284,158 @@ const stateColorList = [
 		bg: 'bg-#ccc'
 	}
 ]
+const orderTodayIncome = ref({})
+
+const getReasonList = () => {
+	$api.reasonList().then(({ page = {} }) => {
+		reasonList.value = page.list || []
+	})
+}
+getReasonList()
+
+onShow(() => {
+	if (!roleName.value) {
+		$dialog('请先登录', {
+			showCancelButton: true,
+			confirmButtonText: '去登录',
+			cancelButtonText: '取消',
+			confirmColor: '#FF8CA6'
+		})
+			.then(() => {
+				// $Router.push('/personal')
+				$store.user.login().then((user) => {
+					// $store.user.setUserInfo(user)
+					!user.nickName
+						? $Router.push({
+								path: '/pages/other/edit-userinfo'
+						  })
+						: userStore.setUserInfo(user) &&
+						  dataList.value[current.value].show &&
+						  paging.value[current.value]?.reload()
+				})
+			})
+			.catch(() => '')
+		return
+	} else paging.value[current.value]?.reload()
+	if (roleName.value === 'common') {
+		$api.orderTodayIncome({ isToday: 0 }).then(({ data = {} }) => {
+			orderTodayIncome.value = data
+		})
+	}
+})
 
 const handleTabChange = (item) => {
+	current.value = item.id
 	status.value = item.id - 1 < 0 ? 0 : item.id - 1
+	dataList.value[item.id].show = true
 }
-const handleClick = (item) => {
-	console.log('🚀 ~ file: index.vue:133 ~ item:', item)
+//swiper滑动结束
+const swiperAnimationfinish = (e) => {
+	const cur = e.detail.current
+	current.value = cur
+	dataList.value[cur].show = true
+}
+
+watch(current, (cur) => {
+	dataList.value[cur].show && paging.value[cur]?.reload()
+})
+
+const queryList = (pageNo, pageSize) => {
+	if (!roleName.value) return
+	const params = {
+		pageNum: pageNo,
+		pageSize: pageSize,
+		status: current.value,
+		roleName: roleName.value
+	}
+	$api
+		.orderList(params)
+		.then(({ data }) => {
+			paging.value[current.value]?.complete(data?.records || [])
+			dataList.value[current.value].data = data?.records || []
+			dataList.value[current.value].show = true
+		})
+		.catch(() => {
+			paging.value[current.value]?.complete(false)
+		})
+}
+
+const handleClick = async (item, type) => {
+	if (type === 'start') {
+		$dialog('确认开始服务吗？', {
+			showCancelButton: true,
+			confirmButtonText: '确定',
+			cancelButtonText: '取消',
+			confirmColor: '#FF8CA6'
+		})
+			.then(async () => {
+				const res = await $api.startOrder({
+					id: item.id
+				})
+				if (res.success) {
+					paging.value?.[current.value]?.reload()
+					$toast('开始服务成功!', { duration: 1000 })
+				}
+			})
+			.catch(() => '')
+	} else if (type === 'end') {
+		$Router.push({
+			path: '/complete',
+			query: {
+				id: item.id,
+				isEvaluate: item.isEvaluate
+			}
+		})
+	} else if (type === 'detail') {
+		$Router.push({
+			path: '/pages/form/index',
+			query: {
+				id: item.id
+			}
+		})
+	} else if (type === 'cancel') {
+		outTradeNo.value = item.outTradeNo
 		popupShow.value = true
+	} else if (type === 'refund') {
+		$dialog('确定要申请退款吗？', {
+			showCancelButton: true,
+			confirmButtonText: '确定',
+			cancelButtonText: '取消',
+			confirmColor: '#FF8CA6'
+		})
+			.then(() => {
+				$api
+					.orderRefund({
+						outTradeNo: item.outTradeNo
+					})
+					.then((res) => {
+						if (res.success)
+							$toast('申请成功,请耐心等待到账！', {
+								icon: 'success',
+								duration: 2000
+							})
+					})
+			})
+			.catch(() => '')
+	}
 }
-const groupChange = (value) => {
-	console.log('🚀 ~ file: index.vue:133 ~ value:', value)
+
+const handleCancelSubmit = async () => {
+	if (!cancelVal.value) return $toast('请选择取消理由')
+	if (cancelVal.value === 5 && !remark.value?.trim()) {
+		return $toast('请填写取消理由')
+	}
+	const res = await $api.cancelOrder({
+		outTradeNo: outTradeNo.value,
+		reasonId: cancelVal.value,
+		remark: remark.value,
+		roleName: roleName.value
+	})
+	if (res.success) {
+		$toast('取消成功')
+		popupShow.value = false
+		paging.value[current.value]?.reload()
+	}
 }
 </script>
 
@@ -211,5 +463,12 @@ page {
 	.u-popup__content {
 		overflow: hidden;
 	}
+	.u-radio {
+		padding-bottom: 20rpx !important;
+		width: 100% !important;
+		.u-radio__text {
+			width: 100%;
+		}
+	}
 }
 </style>

src/pages/index/personal/index.vue

@@ -24,17 +24,17 @@
 				<view v-else claas="text-34rpx text-primary">登录</view>
 			</view>
 		</view>
-		<view class="flex items-center pl-16rpx my-40rpx">
+		<view class="flex items-center pl-16rpx my-40rpx" v-if="userInfo.roleName ==='common'">
 			<view class="flex flex-1 flex-col">
-				<text class="text-34rpx">10</text>
+				<text class="text-34rpx">{{ orderTodayIncome.count || 0 }}</text>
 				<text class="text-28rpx text-#999">累计接单</text>
 			</view>
 			<view class="flex flex-1 flex-col">
-				<text class="text-34rpx">10</text>
+				<text class="text-34rpx">{{ orderTodayIncome.doctorPrice || 0 }}</text>
 				<text class="text-28rpx text-#999">累计收入</text>
 			</view>
 			<view class="flex flex-1 flex-col">
-				<text class="text-34rpx">10</text>
+				<text class="text-34rpx">{{ orderTodayIncome.cashPrice || 0 }}</text>
 				<text class="text-28rpx text-#999">可提现</text>
 			</view>
 			<view
@@ -44,9 +44,9 @@
 				立即提现
 			</view>
 		</view>
-		<view class="relative">
+		<view class="relative mt-40rpx">
 			<view
-				v-for="(item, index) of listModel"
+				v-for="(item, index) of menuList"
 				:key="index"
 				class="flex items-center py-4"
 				@click="handleInfo(item)"
@@ -73,7 +73,7 @@
 			title="提现"
 			@cancel="showWithdraw = false"
 			@confirm="handleWithdraw"
-			confirmText="立即提现"
+			confirmText="申请提现"
 			confirmColor="#FF8CA6"
 			:show-cancel-button="true"
 			:zoom="false"
@@ -81,32 +81,42 @@
 		>
 			<view class="w-full">
 				<view class="flex items-center justify-between mb-36rpx">
-					<view class="">可提现余额：999元</view>
+					<view class=""
+						>可提现余额：{{ orderTodayIncome.cashPrice || 0 }}元</view
+					>
 					<view
+						@click="cashModel.price = orderTodayIncome.cashPrice || 0"
 						class="flex justify-center items-center border-primary-500 border-1px w-150rpx h-54rpx rounded-12rpx text-primary"
 						>全部提现</view
 					>
 				</view>
-				<view class="bg-#f2f2f2 rounded-15rpx h-80rpx">
+				<view class="bg-#f2f2f2 rounded-15rpx">
+					<view
+						v-for="item in cashItemList"
+						:key="item.key"
+						class="bg-#f2f2f2 rounded-15rpx h-80rpx overflow-hidden"
+					>
 						<u-input
 							:customStyle="{ height: '80rpx' }"
-						v-model="amount"
-						type="number"
-						placeholder="请输入金额"
-						border="0"
+							v-model="cashModel[item.key]"
+							:type="item.key === 'price' ? 'number' : 'text'"
+							:placeholder="`请输入${item.key ==='wxNumber' ? '收款账户' : item.text}`"
 							fontSize="28rpx"
+              border="bottom"
 							:focus="false"
 						>
+							<!-- :border="item.key !== 'price' ? 'bottom' : 'none'" -->
 							<template #prefix>
 								<u-text
-								text="金额"
-								margin="0 5px 0 0"
+									:text="item.text"
+									:margin="item.key ==='price' ? '0 5px':'0 5px 0 0'"
 									type="tips"
 									color="#000000"
 								></u-text>
 							</template>
 						</u-input>
 					</view>
+				</view>
 				<view class="mt-12rpx text-24rpx text-#c1c1c1">
 					提现手续费每笔X元
 				</view>
@@ -118,21 +128,30 @@
 
 <script setup>
 import defaultAvatar from '@/static/avatar.png'
+import { onShow } from '@dcloudio/uni-app'
 
 const instance = getCurrentInstance()
-const { $api, $store, $Router, $loading } = instance.proxy
+const { $api, $store, $Router, $loading, $dialog, $toast, $u } = instance.proxy
 
 const userStore = $store.user
-const isLogin = computed(() => !!userStore.token)
-const userInfo = computed(() => userStore.userInfo)
+const isLogin = computed(() => !!$store.user.token)
+const userInfo = computed(() => $store.user.userInfo)
 const showWithdraw = ref(false)
-const amount = ref('')
-const listModel = [
+const orderTodayIncome = ref({})
+const list = {
+	simple: [
 		{
-		icon: '/personal/person.png',
-		text: '就诊人管理',
-		path: ''
+			icon: '/personal/shouru.png',
+			text: '订单管理',
+			path: '/order'
 		},
+		{
+			icon: '/personal/qiehuan.png',
+			text: '成为陪诊师',
+			path: '/pages/other/switch'
+		}
+	],
+	common: [
 		{
 			icon: '/personal/shouru.png',
 			text: '收入详情',
@@ -141,8 +160,16 @@ const listModel = [
 		{
 			icon: '/personal/qiehuan.png',
 			text: '切换身份',
-		path: '/pages/other/switch'
-	},
+			path: ''
+		}
+	]
+}
+const listConst = [
+	// {
+	// 	icon: '/personal/person.png',
+	// 	text: '就诊人管理',
+	// 	path: ''
+	// },
 	{
 		icon: '/personal/lianxi.png',
 		text: '联系客服',
@@ -159,45 +186,139 @@ const listModel = [
 		path: '/pages/contact/index'
 	}
 ]
-function handleInfo(item) {
+const menuList = ref([])
+const cashModel = ref({
+	name: userInfo.value.nickName,
+	wxNumber: '',
+	aliNumber: '',
+	price: ''
+})
+// 姓名 微信号 支付宝号 金额
+const cashItemList = [
+	{
+		text: '姓名',
+		key: 'name',
+		val: ''
+	},
+	{
+		text: '收款账户',
+		key: 'wxNumber',
+		val: ''
+	},
+	// {
+	// 	text: '支付宝号',
+	// 	key: 'aliNumber',
+	// 	val: ''
+	// },
+	{
+		text: '金额',
+		key: 'price',
+		val: ''
+	}
+]
+
+watchEffect(() => {
+	const { roleName, roleList = [] } = userInfo.value
+	list.simple[1].text = roleList.includes('common') ? '切换身份' : '成为陪诊师'
+	menuList.value = [...list[roleName || 'simple'], ...listConst]
+})
+
+const handleInfo = async (item) => {
+	const { roleName, roleList = [] } = userInfo.value
+	if (
+		!item.path ||
+		(item.path === '/pages/other/switch' && roleList.includes('common'))
+	) {
+		try {
+			await $dialog(
+				`确认切换回${roleName === 'simple' ? '陪诊师' : '普通用户'}?`,
+				{
+					showCancelButton: true,
+					confirmButtonText: '确认',
+					cancelButtonText: '取消',
+					confirmColor: '#FF8CA6'
+				}
+			)
+			const { success, wxUser = {} } = await $api.checkRole({ roleName })
+			if (success) {
+				userStore.setUserInfo(wxUser)
+				$toast('身份切换成功！')
+			}
+		} catch (error) {}
+		return
+	}
 	$Router.push({
 		path: item.path,
 		query: item.query || {}
 	})
 }
-// 提现
-const handleWithdraw = () => {}
 
-async function handleLogin() {
+const getOrderTodayIncome = () => {
+	$api.orderTodayIncome({ isToday: 1 }).then(({ data = {} }) => {
+		orderTodayIncome.value = data
+	})
+}
+// 提现
+const handleWithdraw = async () => {
+	console.log(cashModel.value)
+	// return
+	if (!cashModel.value.price) {
+		return $toast('请输入提现金额!')
+	}
+	if (!cashModel.value.name.trim()) {
+		return $toast('请输入姓名!')
+	}
+	if (cashModel.value.price > orderTodayIncome.value.cashPrice) {
+		return $toast('提现金额不能大于可提现余额!', { type: 'error' })
+	}
+	if (cashModel.value.aliNumber?.trim() || cashModel.value.wxNumber?.trim()) {
+		const res = await $api.cashSubmit(cashModel.value)
+		if (res.success) {
+			$toast('申请提现成功！', {
+				icon: 'success',
+				duration: 2000
+			}).then(() => {
+				showWithdraw.value = false
+				getOrderTodayIncome()
+			})
+		}
+	} else {
+		return $toast('请输入收款账号!')
+	}
+}
+
+const handleLogin = async () => {
 	if (!isLogin.value) {
 		$loading(true)
 		userStore.login().then((user) => {
 			$loading(false)
-			!user.id &&
-				$Router.push({
+			!user.nickName
+				? $Router.push({
 						path: '/pages/other/edit-userinfo'
 				  })
+				: userStore.setUserInfo(user)
 		})
 	} else
 		$Router.push({
 			path: '/pages/other/edit-userinfo'
 		})
 }
-// await userStore.logout()
-// await $toast('退出登录成功', { type: 'success' })
 
 const getUserInfo = async () => {
 	if (isLogin.value) {
-		$loading(true)
 		const res = await $api.getUser()
-		if (res.success) {
-			$loading(false)
+		if (res?.success) {
 			userStore.setUserInfo(res.wxUser || {})
+			if (res.wxUser?.roleName === 'common') {
+				getOrderTodayIncome()
+			}
+		}
 	} else userStore.logout()
-	} else userStore.removeUserInfo()
 }
 
-getUserInfo()
+onShow(() => {
+	getUserInfo()
+})
 </script>
 
 <style lang="scss" scoped>

src/pages/other/edit-userinfo.vue

@@ -17,14 +17,15 @@
 			<view
 				>昵称 <text class="text-#999 text-24rpx">建议改为真实姓名</text></view
 			>
-			<u-input
+			<input
         v-model="userInfo.nickName"
+        @change="handleNickName"
 				type="nickname"
 				placeholder=""
 				inputAlign="right"
 				maxlength="20"
 				border="0"
-			></u-input>
+			/>
 		</view>
 		<view
 			class="relative h-130rpx flex justify-between items-center border-b-#E5E5E5 border-b-1px"
@@ -75,10 +76,10 @@
 
 <script setup>
 const instance = getCurrentInstance()
-const { $api, $store, $Router, $u } = instance.proxy
+const { $api, $store, $Router, $u,$toast } = instance.proxy
 const show = ref(false)
 const columns = ref([['男', '女']])
-const userInfo = ref($store.user.userInfo)
+const userInfo = ref(...$store.user.userInfo)
 const isEdit = ref($Router.query?.edit || false)
 
 const hadleConfirm = ({ indexs: [index] }) => {
@@ -94,17 +95,17 @@ const getPhoneNumber = async (e) => {
 		}
 	}
 }
+const handleNickName = (e) => {
+  userInfo.value.nickName = e.detail.value
+}
 
 const handleSave = async () => {
 	const res = await $api.userSave(userInfo.value)
 	if (res.success) {
-		$u.toast('保存成功')
     $store.user.setUserInfo(userInfo.value)
-		setTimeout(() => {
-			$Router.push({
-				path: '/personal'
+		$toast('保存成功').then(()=>{
+      $Router.back()
     })
-		}, 500)
 	}
 }
 </script>
@@ -113,4 +114,8 @@ const handleSave = async () => {
 page {
 	background-color: #fff;
 }
+input{
+  text-align: right;
+  padding-right: 6rpx;
+}
 </style>

src/pages/other/income-details.vue

@@ -1,30 +1,45 @@
 <template>
-	<view>
-		<view class="flex items-center justify-between px-50rpx pt-20rpx pb-40rpx">
+	<z-paging
+		:ref="paging"
+		v-model="recordList"
+		@query="queryList"
+		:min-delay="300"
+		use-page-scroll
+	>
+		<template #top>
 			<view
-				class="flex justify-center items-center w-150rpx h-64rpx rounded-36rpx bg-primary text-white"
+				class="flex items-center justify-between px-50rpx pt-20rpx pb-40rpx"
+			>
+				<view
+					@click="handleAll"
+					class="flex justify-center items-center w-150rpx h-64rpx rounded-36rpx"
+					:class="!isSelect ? 'bg-primary text-white' : 'bg-#f2f2f2 text-#000'"
 				>
 					全部
 				</view>
 				<view
 					@click="datetimeShow = true"
-				class="flex justify-center items-center w-250rpx h-64rpx rounded-36rpx bg-#f2f2f2 text-#000"
+					class="flex justify-center items-center w-250rpx h-64rpx rounded-36rpx"
+					:class="isSelect ? 'bg-primary text-white' : 'bg-#f2f2f2 text-#000'"
 				>
 					{{ $u.timeFormat(datetime, 'yyyy-mm') }}
 				</view>
 			</view>
+		</template>
 
-		<view class="px-34rpx">
+		<view class="px-34rpx relative">
 			<view
 				class="flex justify-between pb-20rpx border-b-#E5E5E5 border-b-1px mb-20rpx"
-				v-for="i in 10"
-				:key="i"
+				v-for="item in recordList"
+				:key="item.id"
 			>
 				<view class="flex flex-col text-28rpx">
-					<text class="">陪诊sour</text>
-					<text class="text-24rpx text-#999">2023年3月1日</text>
+					<text class="">提现金额</text>
+					<text class="text-24rpx text-#999">{{
+						$u.timeFormat(item.createTime, 'yyyy年mm月dd')
+					}}</text>
 				</view>
-				<view class="text-#FF3939">+100</view>
+				<view class="text-#FF3939">-{{ item.price || 0 }}</view>
 				<!-- <u-text
 					text="+100"
 					mode="price"
@@ -47,18 +62,48 @@
 			@close="datetimeShow = false"
 			closeOnClickOverlay
 		></u-datetime-picker>
-	</view>
+	</z-paging>
 </template>
 
 <script setup>
 const instance = getCurrentInstance()
-const { $u } = instance.proxy
+const { $u, $api } = instance.proxy
 const datetimeShow = ref(false)
 const datetime = ref(new Date().getTime())
+const recordList = ref([])
+const isSelect = ref(false)
+const paging = ref(null)
 const handleDatePickerConfirm = ({ value }) => {
 	datetime.value = $u.timeFormat(value, 'yyyy-mm')
 	datetimeShow.value = false
+	isSelect.value = true
+	getRecordList()
 }
+
+const handleAll = () => {
+	isSelect.value = false
+	getRecordList()
+}
+
+const getRecordList = async (pageNum = 1, pageSize = 10) => {
+	const res = await $api.cashSubmitRecord({
+		time: isSelect.value ? datetime.value : '',
+		pageNum,
+		pageSize
+	})
+	if (res.success) {
+		recordList.value = res.page?.list || []
+		paging.value?.complete(res.page?.list || [])
+	} else {
+		paging.value?.complete(false)
+	}
+}
+
+const queryList = (pageNo, pageSize) => {
+	getRecordList(pageNo, pageSize)
+}
+
+queryList(1, 100)
 </script>
 
 <style lang="scss" scoped>

src/pages/other/switch.vue

@@ -25,7 +25,7 @@
 						inputAlign="right"
 						maxlength="300"
 						:placeholder="item.placeholder"
-						:readonly="false"
+						:readonly="model.status === 0"
 					/>
 					<view class="w-full" v-else-if="item.type === 'radio'">
 						<u-radio-group
@@ -34,9 +34,10 @@
 							activeColor="#FF8CA6"
 							shape="square"
 							placement="row"
+              :disabled="model.status === 0"
 						>
-							<u-radio :name="0" label="男"></u-radio>
-							<u-radio :name="1" label="女" class="ml-50rpx"></u-radio>
+							<u-radio name="0" label="男"></u-radio>
+							<u-radio name="1" label="女" class="ml-50rpx"></u-radio>
 						</u-radio-group>
 					</view>
 					<view v-else class="w-full text-right u-line-1 pl-2 text-#C0C4CC"
@@ -45,11 +46,12 @@
 				</u-form-item>
 			</u--form>
 			<u--textarea
-				v-model="model.remark"
+				count
+				v-model="model.intro"
 				placeholder=""
 				maxlength="300"
-				count
 				:autoHeight="false"
+        :disabled="model.status === 0"
 			/>
 			<view class="mt-32rpx mb-20rpx text-28rpx">
 				<view class=""
@@ -59,40 +61,67 @@
 						>*</text
 					>
 				</view>
-				<view class="flex justify-between mb-32rpx">
+				<view class="flex justify-between mb-32rpx mt-20rpx">
 					<view
-						@click="handleChooseImage"
-						class="relative w-330rpx bg-#f2f2f2 rounded-md px-52rpx pt-30rpx pb-20rpx"
+						@click="handleChooseImage('ren')"
+						class="relative w-330rpx h-250rpx bg-#f2f2f2 rounded-md px-52rpx pt-30rpx pb-20rpx"
 					>
-						<block v-if="!fileList[0]">
+						<block v-if="!imageObj.ren">
 							<image class="w-full h-146rpx" :src="$assets('/zheng.png')" />
 							<view class="text-24rpx mt-10rpx text-#999 w-full text-center"
 								>上传身份证人像面</view
 							>
 						</block>
+						<view
+							v-else
+							class="absolute top-0 left-0 right-0 bottom-0 rounded-md overflow-hidden"
+						>
+							<u--image
+								mode="aspectFit"
+								width="330rpx"
+								height="250rpx"
+								:duration="100"
+								:src="imageObj.ren"
+							/>
+						</view>
 					</view>
 					<view
-						@click="handleChooseImage"
+						@click="handleChooseImage('fan')"
 						class="relative w-330rpx bg-#f2f2f2 rounded-md px-52rpx pt-30rpx pb-20rpx"
 					>
+						<block v-if="!imageObj.fan">
 							<image class="w-full h-146rpx" :src="$assets('/fan.png')" />
 							<view class="text-24rpx mt-10rpx text-#999 w-full text-center"
 								>上传身份证国徽面</view
 							>
+						</block>
+						<view
+							v-else
+							class="absolute top-0 left-0 rounded-md overflow-hidden"
+						>
+							<u--image
+								mode="aspectFit"
+								width="330rpx"
+								height="250rpx"
+								:duration="100"
+								:src="imageObj.fan"
+							/>
+						</view>
 					</view>
 				</view>
 				<text class="text-24rpx text-#999"
 					>备注：申请表提交后会有工作人员主动联系您，请耐心等待</text
 				>
-				<agreed-comp v-model:agreed="agreed" />
+				<agreed-comp v-model:agreed="agreed" :disabled="model.status === 0" />
 			</view>
 
 			<view
 				class="fixed bg-#fff bottom-0 pb-8 left-0 right-0 text-white pt-12rpx border-t-1px border-solid border-#E5E5E5"
 				><view
-					@click="handleSubmit"
-					class="bg-#FF8CA6 rounded-24rpx w-660rpx h-80rpx text-center leading-80rpx hover:shadow-md mx-auto"
-					>提交申请</view
+					@click="$u.throttle(handleSubmit, 1000)"
+					class=" rounded-24rpx w-660rpx h-80rpx text-center leading-80rpx hover:shadow-md mx-auto"
+          :class="model.status === 0 ? 'bg-#ccc' : 'bg-#FF8CA6'"
+					>{{model.status === 0 ? '申请中' : '提交申请'}}</view
 				></view
 			>
 		</view>
@@ -101,16 +130,18 @@
 
 <script setup>
 import { chooseImage } from '@uni-helper/uni-promises'
+import { onShow } from '@dcloudio/uni-app'
 
 const instance = getCurrentInstance()
-const { $api, $toast, $store } = instance.proxy
+const { $api, $toast, $store, $u, $dialog, $Router, $loading } = instance.proxy
 const userInfo = computed(() => $store.user.userInfo)
-const fileList = ref([])
+const isLogin = computed(() => !!$store.user.token)
 const agreed = ref(false)
 const formRef = ref(null)
 const formList = ref([])
 const model = ref({})
 const rules = ref({})
+const imageObj = ref({})
 // 姓名 性别 年龄 手机号 微信号 个人介绍 常驻地点 上传身份证
 const formItems = [
 	{
@@ -131,7 +162,14 @@ const formItems = [
 		required: true,
 		type: 'radio',
 		trigger: ['blur', 'change'],
-		message: '请选择性别'
+		message: '请选择性别',
+		validator: {
+			validator: (rule, value, callback) => {
+				return value > -1
+			},
+			message: '请选择性别',
+			trigger: ['change', 'blur']
+		}
 	},
 	{
 		label: '年龄',
@@ -140,7 +178,12 @@ const formItems = [
 		required: true,
 		type: 'string',
 		trigger: ['blur', 'change'],
-		message: '请输入年龄'
+		message: '请输入年龄',
+		validator: {
+			validator: (rule, value, callback) => $u.test.digits(value),
+			message: '年龄必须为数字',
+			trigger: 'blur'
+		}
 	},
 	{
 		label: '手机号',
@@ -149,17 +192,24 @@ const formItems = [
 		required: true,
 		type: 'string',
 		trigger: ['blur', 'change'],
-		message: '请输入手机号'
+		message: '请输入手机号',
+		validator: {
+			validator: (rule, value, callback) => {
+				return $u.test.mobile(value)
 			},
-	{
-		label: '微信号',
-		placeholder: '请输入微信号',
-		key: 'weNumber',
-		required: true,
-		type: 'string',
-		trigger: ['blur', 'change'],
-		message: '请输入微信号'
+			message: '手机号码格式有误',
+			trigger: 'blur'
+		}
 	},
+	// {
+	// 	label: '微信号',
+	// 	placeholder: '请输入微信号',
+	// 	key: 'wxNumber',
+	// 	required: true,
+	// 	type: 'string',
+	// 	trigger: ['blur', 'change'],
+	// 	message: '请输入微信号'
+	// },
 	{
 		label: '常驻地点',
 		placeholder: '请输入常驻地点',
@@ -188,17 +238,36 @@ const formItems = [
 	// 	message: '请上传身份证'
 	// }
 ]
+onMounted(() => {
+	formRef.value.setRules(rules.value)
+})
 
-const init = () => {
+const init = async () => {
+	$loading(true)
 	formItems.forEach((item) => {
-		const { required, key, keyName, message, trigger } = item
-		rules.value[item.key] = [{ required, message, trigger }]
+		const { required, key, keyName, message, trigger, validator } = item
+		rules.value[item.key] =
+			typeof validator === 'object'
+				? [{ required, message, trigger }, validator]
+				: [{ required, message, trigger }]
 		formList.value.push(item)
 		model.value[key] = userInfo.value[keyName || key] ?? null
 	})
+	model.value.sex = +userInfo.value.gender
+	model.value.intro = model.value.intro ?? ''
+	const res = await $api.doctorInfo()
+	if (res.success && typeof res.doctor === 'object' && res.doctor) {
+		Object.assign(model.value, res.doctor)
+		const images = res.doctor.images.split(',')
+		imageObj.value.ren = images[0]
+		imageObj.value.fan = images[1]
+    agreed.value = true
+	}
+	$loading(false)
 }
 
-const handleChooseImage = async () => {
+const handleChooseImage = async (key) => {
+  if(model.value.status === 0) return
 	let filePath = ''
 	try {
 		const ret = await chooseImage({
@@ -206,7 +275,6 @@ const handleChooseImage = async () => {
 		})
 		filePath = ret.tempFilePaths[0]
 	} catch (error) {
-		console.warn('handleChooseImage.error', error)
 		return
 	}
 	if (!filePath) {
@@ -217,16 +285,68 @@ const handleChooseImage = async () => {
 		filePath
 	})
 	if (res.success) {
-		console.log('res.data', res)
+		imageObj.value[key] = res.msg
 	}
 }
 
-const handleSubmit = () => {
-	formRef.value?.validate().then(() => {
+const handleSubmit = async () => {
+	formRef.value?.validate().then(async () => {
+		if (!imageObj.value.ren) {
+			$toast('请上传身份证人像面!')
+		} else if (!imageObj.value.fan) {
+			$toast('请上传身份证国徽面!')
+		} else {
+			if (!agreed.value) {
+				try {
+					await $dialog('是否已阅读并同意《服务条款》?', {
+						showCancelButton: true,
+						confirmButtonText: '同意',
+						cancelButtonText: '取消',
+						confirmColor: '#FF8CA6'
+					})
+
+					agreed.value = true
+				} catch (error) {
+					return
+				}
+			}
+			$loading(true)
+			const images = []
+			Object.entries(imageObj.value).forEach(([key, value]) => {
+				images.push(value)
+			})
+			model.value.images = images.join(',')
+			const res = await $api.doctorSave({
+				...model.value
+			})
+			if (res.success) {
 				$toast('提交成功')
+				setTimeout(() => {
+					$Router.push({
+						path: '/personal'
+					})
+				}, 500)
+			}
+			$loading(false)
+		}
 	})
 }
 
+onShow(() => {
+	if (!isLogin.value) {
+		$dialog('请先登录', {
+			showCancelButton: true,
+			confirmButtonText: '去登录',
+			cancelButtonText: '取消',
+			confirmColor: '#FF8CA6'
+		})
+			.then(() => {
+				$Router.push('/personal')
+			})
+			.catch(() => '')
+		return
+	} 
+})
 init()
 </script>
 

src/store/user/index.js

@@ -1,9 +1,9 @@
 import { defineStore } from 'pinia'
 import { getToken, removeToken, setToken, getUserInfo as getStorageUserInfo, setUserInfo, removeUserInfo } from '@/utils/token.js'
 import { getUserInfo, userLogin } from '@/api/user/index.js'
-import defaultAvatar from '@/static/avatar.png'
-import router from '@/router'
 import { useToast } from '@/utils/modals/index.js'
+// import defaultAvatar from '@/static/avatar.png'
+// import router from '@/router'
 
 // import storage from '@/utils/storages'
 
@@ -16,7 +16,7 @@ export const useUserStore = defineStore('app-user', {
   },
   getters: {
     userId: state => state.userInfo?.userId,
-    avatar: state => state.userInfo?.avatar,
+    roleName: state => state.userInfo?.roleName ?? 'simple',
     username: state => state.userInfo?.username,
     resumed: state => !!state.resumeInfo.id,
   },
@@ -38,9 +38,17 @@ export const useUserStore = defineStore('app-user', {
           provider: 'weixin',
           success: ({ userInfo }) => {
             // 获取用户信息成功
+            if (res.token) {
               this.setUserInfo(userInfo)
               this.setToken(res.token)
               resolve(userInfo)
+            } else {
+              useToast('微信登录失败！', {
+                type: 'error',
+                duration: 2 * 1000,
+              })
+              reject('登录失败!')
+            }
           },
           fail: (err) => {
             useToast('微信登录失败，请先同意授权！', {

src/utils/token.js

@@ -7,7 +7,7 @@ export function setToken (data) {
 export const getToken = () => storage.get('token')
 
 export function removeToken () {
-  storage.remove('userInfo')
+  storage.remove('token')
 }
 export function setUserInfo (data) {
   storage.set('userInfo', data)

src/wxcomponents/vant-weapp/action-sheet/index.d.ts

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

src/wxcomponents/vant-weapp/action-sheet/index.js

@@ -1,71 +0,0 @@
-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();
-        },
-    },
-});

src/wxcomponents/vant-weapp/action-sheet/index.json

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

src/wxcomponents/vant-weapp/action-sheet/index.wxml

@@ -1,69 +0,0 @@
-<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>

src/wxcomponents/vant-weapp/action-sheet/index.wxss

@@ -1 +0,0 @@
-@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}

src/wxcomponents/vant-weapp/area/index.d.ts

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

src/wxcomponents/vant-weapp/area/index.js

@@ -1,220 +0,0 @@
-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();
-        },
-    },
-});

src/wxcomponents/vant-weapp/area/index.json

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

src/wxcomponents/vant-weapp/area/index.wxml

@@ -1,20 +0,0 @@
-<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"
-/>

src/wxcomponents/vant-weapp/area/index.wxs

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

src/wxcomponents/vant-weapp/area/index.wxss

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

src/wxcomponents/vant-weapp/button/index.d.ts

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

src/wxcomponents/vant-weapp/button/index.js

@@ -1,64 +0,0 @@
-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);
-                    },
-                });
-            }
-        },
-    },
-});

src/wxcomponents/vant-weapp/button/index.json

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

src/wxcomponents/vant-weapp/button/index.wxml

@@ -1,56 +0,0 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-<wxs src="./index.wxs" module="computed" />
-
-<button
-  id="{{ id || buttonId }}"
-  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"
-  bindgetrealtimephonenumber="onGetRealTimePhoneNumber"
-  bindagreeprivacyauthorization="onAgreePrivacyAuthorization"
-  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>

src/wxcomponents/vant-weapp/button/index.wxs

@@ -1,39 +0,0 @@
-/* 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,
-};

src/wxcomponents/vant-weapp/button/index.wxss

@@ -1 +0,0 @@
-@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}

src/wxcomponents/vant-weapp/calendar/calendar.wxml

@@ -1,68 +0,0 @@
-<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>

src/wxcomponents/vant-weapp/calendar/components/header/index.d.ts

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

src/wxcomponents/vant-weapp/calendar/components/header/index.js

@@ -1,37 +0,0 @@
-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);
-        },
-    },
-});

src/wxcomponents/vant-weapp/calendar/components/header/index.json

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

src/wxcomponents/vant-weapp/calendar/components/header/index.wxml

@@ -1,16 +0,0 @@
-<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>

src/wxcomponents/vant-weapp/calendar/components/header/index.wxss

@@ -1 +0,0 @@
-@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}

src/wxcomponents/vant-weapp/calendar/components/month/index.d.ts

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

src/wxcomponents/vant-weapp/calendar/components/month/index.js

@@ -1,154 +0,0 @@
-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 '开始/结束';
-                }
-            }
-        },
-    },
-});

src/wxcomponents/vant-weapp/calendar/components/month/index.json

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

src/wxcomponents/vant-weapp/calendar/components/month/index.wxml

@@ -1,39 +0,0 @@
-<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>

src/wxcomponents/vant-weapp/calendar/components/month/index.wxs

@@ -1,71 +0,0 @@
-/* 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
-};

src/wxcomponents/vant-weapp/calendar/components/month/index.wxss

@@ -1 +0,0 @@
-@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)}

src/wxcomponents/vant-weapp/calendar/index.d.ts

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

src/wxcomponents/vant-weapp/calendar/index.js

@@ -1,356 +0,0 @@
-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,
-            value: getToday().getTime(),
-            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: '',
-    },
-    watch: {
-        minDate() {
-            this.initRect();
-        },
-        maxDate() {
-            this.initRect();
-        },
-    },
-    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.data.defaultDate) });
-            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;
-            if (!defaultDate)
-                return [];
-            const now = getToday().getTime();
-            if (type === 'range') {
-                if (!Array.isArray(defaultDate)) {
-                    defaultDate = [];
-                }
-                const [startDay, endDay] = defaultDate || [];
-                const startDate = getTime(startDay || now);
-                const start = this.limitDateRange(startDate, minDate, allowSameDay ? startDate : 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;
-                if (!currentDate)
-                    return;
-                // @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], true);
-                    }
-                }
-                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);
-        },
-    },
-});

src/wxcomponents/vant-weapp/calendar/index.json

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

src/wxcomponents/vant-weapp/calendar/index.wxml

@@ -1,26 +0,0 @@
-<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" />

src/wxcomponents/vant-weapp/calendar/index.wxs

@@ -1,37 +0,0 @@
-/* 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
-};

src/wxcomponents/vant-weapp/calendar/index.wxss

@@ -1 +0,0 @@
-@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,90%)}.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}

src/wxcomponents/vant-weapp/calendar/utils.d.ts

@@ -1,12 +0,0 @@
-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[];

src/wxcomponents/vant-weapp/calendar/utils.js

@@ -1,83 +0,0 @@
-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;
-}

src/wxcomponents/vant-weapp/calendar/utils.wxs

@@ -1,25 +0,0 @@
-/* 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
-};

src/wxcomponents/vant-weapp/card/index.d.ts

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

src/wxcomponents/vant-weapp/card/index.js

@@ -1,49 +0,0 @@
-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');
-        },
-    },
-});

src/wxcomponents/vant-weapp/card/index.json

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

src/wxcomponents/vant-weapp/card/index.wxml

@@ -1,56 +0,0 @@
-<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>

src/wxcomponents/vant-weapp/card/index.wxss

@@ -1 +0,0 @@
-@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%}

src/wxcomponents/vant-weapp/cascader/index.d.ts

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

src/wxcomponents/vant-weapp/cascader/index.js

@@ -1,208 +0,0 @@
-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,
-        },
-        placeholder: {
-            type: String,
-            value: '请选择',
-        },
-        activeColor: {
-            type: String,
-            value: '#1989fa',
-        },
-        options: {
-            type: Array,
-            value: [],
-        },
-        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,
-        innerValue: '',
-    },
-    watch: {
-        options() {
-            this.updateTabs();
-        },
-        value(newVal) {
-            this.updateValue(newVal);
-        },
-    },
-    created() {
-        this.updateTabs();
-    },
-    methods: {
-        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.innerValue = val;
-            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() {
-            const { options } = this.data;
-            const { innerValue } = this;
-            if (!options.length) {
-                return;
-            }
-            if (innerValue !== undefined) {
-                const selectedOptions = this.getSelectedOptionsByValue(options, innerValue);
-                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;
-                }
-            }
-            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 value = option[valueKey];
-            const params = {
-                value,
-                tabIndex,
-                selectedOptions,
-            };
-            this.innerValue = value;
-            this.$emit('change', params);
-            if (!option[childrenKey]) {
-                this.$emit('finish', params);
-            }
-        },
-    },
-});

src/wxcomponents/vant-weapp/cascader/index.json

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

src/wxcomponents/vant-weapp/cascader/index.wxml

@@ -1,53 +0,0 @@
-<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, valueKey, option) }}"
-        style="{{ utils.optionStyle({ tab, valueKey, option, activeColor }) }}"
-        data-option="{{ option }}"
-        data-tab-index="{{ tabIndex }}"
-        bind:tap="onSelect"
-      >
-        <text>{{ option[textKey] }}</text>
-        <van-icon wx:if="{{ utils.isSelected(tab, valueKey, option) }}" name="success" size="18" />
-      </view>
-    </view>
-    <!-- 暂不支持 -->
-    <!-- <slot name="options-bottom"></slot> -->
-  </van-tab>
-</van-tabs>

src/wxcomponents/vant-weapp/cascader/index.wxs

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

src/wxcomponents/vant-weapp/cascader/index.wxss

@@ -1 +0,0 @@
-@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}

src/wxcomponents/vant-weapp/cell-group/index.d.ts

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

src/wxcomponents/vant-weapp/cell-group/index.js

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

src/wxcomponents/vant-weapp/cell-group/index.json

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

src/wxcomponents/vant-weapp/cell-group/index.wxml

@@ -1,11 +0,0 @@
-<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>

src/wxcomponents/vant-weapp/cell-group/index.wxss

@@ -1 +0,0 @@
-@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)}

src/wxcomponents/vant-weapp/cell/index.d.ts

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

src/wxcomponents/vant-weapp/cell/index.js

@@ -1,38 +0,0 @@
-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();
-        },
-    },
-});

src/wxcomponents/vant-weapp/cell/index.json

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

src/wxcomponents/vant-weapp/cell/index.wxml

@@ -1,47 +0,0 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-<wxs src="./index.wxs" module="computed" />
-
-<view
-  class="custom-class {{ utils.bem('cell', [size, { center, required, borderless: !border, clickable: isLink || clickable }]) }}"
-  hover-class="van-cell--hover hover-class"
-  hover-stay-time="70"
-  style="{{ customStyle }}"
-  bind:tap="onClick"
->
-  <van-icon
-    wx:if="{{ icon }}"
-    name="{{ icon }}"
-    class="van-cell__left-icon-wrap"
-    custom-class="van-cell__left-icon"
-  />
-  <slot wx:else name="icon" />
-
-  <view
-    style="{{ computed.titleStyle({ titleWidth, titleStyle }) }}"
-    class="van-cell__title title-class"
-  >
-
-    <block wx:if="{{ title }}">{{ title }}</block>
-    <slot wx:else name="title" />
-
-    <view wx:if="{{ label || useLabelSlot }}" class="van-cell__label label-class">
-      <slot wx:if="{{ useLabelSlot }}" name="label" />
-      <block wx:elif="{{ label }}">{{ label }}</block>
-    </view>
-  </view>
-
-  <view class="van-cell__value value-class">
-    <block wx:if="{{ value || value === 0 }}">{{ value }}</block>
-    <slot wx:else />
-  </view>
-
-  <van-icon
-    wx:if="{{ isLink }}"
-    name="{{ arrowDirection ? 'arrow' + '-' + arrowDirection : 'arrow' }}"
-    class="van-cell__right-icon-wrap right-icon-class"
-    custom-class="van-cell__right-icon"
-  />
-  <slot wx:else name="right-icon" />
-
-  <slot name="extra" />
-</view>

src/wxcomponents/vant-weapp/cell/index.wxs

@@ -1,17 +0,0 @@
-/* eslint-disable */
-var style = require('../wxs/style.wxs');
-var addUnit = require('../wxs/add-unit.wxs');
-
-function titleStyle(data) {
-  return style([
-    {
-      'max-width': addUnit(data.titleWidth),
-      'min-width': addUnit(data.titleWidth),
-    },
-    data.titleStyle,
-  ]);
-}
-
-module.exports = {
-  titleStyle: titleStyle,
-};

src/wxcomponents/vant-weapp/cell/index.wxss

@@ -1 +0,0 @@
-@import '../common/index.wxss';.van-cell{background-color:var(--cell-background-color,#fff);box-sizing:border-box;color:var(--cell-text-color,#323233);display:flex;font-size:var(--cell-font-size,14px);line-height:var(--cell-line-height,24px);padding:var(--cell-vertical-padding,10px) var(--cell-horizontal-padding,16px);position:relative;width:100%}.van-cell:after{border-bottom:1px solid #ebedf0;bottom:0;box-sizing:border-box;content:" ";left:16px;pointer-events:none;position:absolute;right:16px;transform:scaleY(.5);transform-origin:center}.van-cell--borderless:after{display:none}.van-cell-group{background-color:var(--cell-background-color,#fff)}.van-cell__label{color:var(--cell-label-color,#969799);font-size:var(--cell-label-font-size,12px);line-height:var(--cell-label-line-height,18px);margin-top:var(--cell-label-margin-top,3px)}.van-cell__value{color:var(--cell-value-color,#969799);overflow:hidden;text-align:right;vertical-align:middle}.van-cell__title,.van-cell__value{flex:1}.van-cell__title:empty,.van-cell__value:empty{display:none}.van-cell__left-icon-wrap,.van-cell__right-icon-wrap{align-items:center;display:flex;font-size:var(--cell-icon-size,16px);height:var(--cell-line-height,24px)}.van-cell__left-icon-wrap{margin-right:var(--padding-base,4px)}.van-cell__right-icon-wrap{color:var(--cell-right-icon-color,#969799);margin-left:var(--padding-base,4px)}.van-cell__left-icon{vertical-align:middle}.van-cell__left-icon,.van-cell__right-icon{line-height:var(--cell-line-height,24px)}.van-cell--clickable.van-cell--hover{background-color:var(--cell-active-color,#f2f3f5)}.van-cell--required{overflow:visible}.van-cell--required:before{color:var(--cell-required-color,#ee0a24);content:"*";font-size:var(--cell-font-size,14px);left:var(--padding-xs,8px);position:absolute}.van-cell--center{align-items:center}.van-cell--large{padding-bottom:var(--cell-large-vertical-padding,12px);padding-top:var(--cell-large-vertical-padding,12px)}.van-cell--large .van-cell__title{font-size:var(--cell-large-title-font-size,16px)}.van-cell--large .van-cell__value{font-size:var(--cell-large-value-font-size,16px)}.van-cell--large .van-cell__label{font-size:var(--cell-large-label-font-size,14px)}

src/wxcomponents/vant-weapp/checkbox-group/index.d.ts

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

src/wxcomponents/vant-weapp/checkbox-group/index.js

@@ -1,36 +0,0 @@
-import { useChildren } from '../common/relation';
-import { VantComponent } from '../common/component';
-VantComponent({
-    field: true,
-    relation: useChildren('checkbox', function (target) {
-        this.updateChild(target);
-    }),
-    props: {
-        max: Number,
-        value: {
-            type: Array,
-            observer: 'updateChildren',
-        },
-        disabled: {
-            type: Boolean,
-            observer: 'updateChildren',
-        },
-        direction: {
-            type: String,
-            value: 'vertical',
-        },
-    },
-    methods: {
-        updateChildren() {
-            this.children.forEach((child) => this.updateChild(child));
-        },
-        updateChild(child) {
-            const { value, disabled, direction } = this.data;
-            child.setData({
-                value: value.indexOf(child.data.name) !== -1,
-                parentDisabled: disabled,
-                direction,
-            });
-        },
-    },
-});

src/wxcomponents/vant-weapp/checkbox-group/index.json

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

src/wxcomponents/vant-weapp/checkbox-group/index.wxml

@@ -1,5 +0,0 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view class="{{ utils.bem('checkbox-group', [{ horizontal: direction === 'horizontal' }]) }}">
-  <slot />
-</view>

src/wxcomponents/vant-weapp/checkbox-group/index.wxss

@@ -1 +0,0 @@
-@import '../common/index.wxss';.van-checkbox-group--horizontal{display:flex;flex-wrap:wrap}