Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/common/classify.data.js

@@ -4,7 +4,7 @@ export default [{
 				"required": true,
 				"fieldsTitle": "A字裙",
 				"fieldsName": "name",
-				"fieldsType": "input",
+				"fieldsType": "text",
 				"fieldsValue": "",
 				"key": "A字裙",
 				"icon": "https://cdn.uviewui.com/uview/common/classify/1/1.jpg",
@@ -64,7 +64,10 @@ export default [{
 				"cat": 10
 			},
 			{
-				"fieldsTitle": "妈妈装",
+				"fieldsTitle": "多级选择",
+				"fieldsName": "mutiPicker",
+				"fieldsType": "mutipicker",
+				"required": true,
 				"key": "妈妈装",
 				"icon": "https://cdn.uviewui.com/uview/common/classify/1/8.jpg",
 				"cat": 10

src/components/createCom/XhCheckbox.vue

+<!-- *******************  多选框  *******************  -->
 <template>
 	<view class="list">
 		<view v-for="(item,index) in settings" :key="index"

src/components/createCom/XhFiles.vue

+<!-- *******************  文件上传  *******************  -->
 <template>
 	<view class="file-box">
 		<view class="u-flex" @click="selectUpload">

src/components/createCom/XhInput - 副本.vue

+<!-- *******************  输入框  *******************  -->
+<template>
+	<view>
+		<u-input v-model="dataValue" @input="valueChange" :type="type" />
+	</view>
+</template>
+
+<script>
+	import stringMixin from './stringMixin'
+	export default {
+		name: 'XhInput', // 新建 input
+		components: {},
+		mixins: [stringMixin],
+		props: {},
+		data() {
+			return {}
+		},
+		computed: {
+			type() {
+				if (this.item && this.item.fieldsType == 'password') {
+					return this.item.fieldsType
+				} else {
+					return 'text'
+				}
+			}
+		},
+		watch: {},
+		mounted() {},
+		methods: {}
+	}
+</script>
+
+<style>
+</style>

src/components/createCom/XhInput.vue

+<!-- *******************  输入框  *******************  -->
 <template>
 	<view>
 		<u-input v-model="dataValue" @input="valueChange" :type="type" />

src/components/createCom/XhLocation.vue

+<!-- *******************  定位  *******************  -->
 <template>
 	<view class="list u-flex u-row-between">
 		<text class="required" v-if="item.required">*</text>

src/components/createCom/XhPicker.vue

+<!-- *******************  单级/多级 选择  *******************  -->
+<template>
+	<view class="picker-box">
+		<view class="u-flex u-row-between" @click="openPicker">
+			<view class="txt u-flex-1">{{item.fieldsTitle}}</view>
+			<u-icon name="arrow-right" color="#666" size="28"></u-icon>
+		</view>
+		<u-picker v-model="showPicker" :rangeKey="rangeKey" @columnchange="columnchange" mode="multiSelector" @confirm="pickerConfirm" :default-selector='[0, 1]' :range="settings"></u-picker>
+	</view>
+</template>
+
+<script>
+	import objMixin from './objMixin'
+	export default {
+		name: 'XhPicker',
+		components: {},
+		mixins: [objMixin],
+		props: {
+			// 当mode=selector或者mode=multiSelector时，提供的默认选中的下标
+			defaultSelector: {
+				type: Array,
+				default() {
+					return [0];
+				}
+			},
+			// 当 range 是一个 Array＜Object＞ 时，通过 range-key 来指定 Object 中 key 的值作为选择器显示内容
+			rangeKey: {
+				type: String,
+				default: ''
+			},
+		},
+		filters:{},
+		data() {
+			return {
+				showPicker:false,
+				settings:[
+					[1, 2, 3], 
+					[4, 5, 6]
+				]
+			}
+		},
+		computed: {
+			// settings() {
+			// 	let setting = [
+			// 		[1, 2, 3], 
+			// 		[4, 5, 6]
+			// 	]
+			// 	return setting
+			// 	// return this.item.settings || []
+			// }
+		},
+		watch: {},
+		mounted() {},
+		methods: {
+			openPicker(){
+				this.showPicker = true
+			},
+			pickerConfirm(data){
+				
+				let result = []
+				data&&data.map((item,index)=>{
+					let val = this.settings[index][item]
+					result.push(val)
+				})
+				this.dataValue = result
+				this.valueChange(result)
+				console.log(result,'result')
+			},
+			columnchange(data){
+				console.log(data,'data')
+				// 树列改变时进行联动操作
+				const {column ,index} = data
+				let arr = [9,10,50]
+				this.settings.splice(column+1,1,arr)
+				console.log(this.settings,'this.settings')
+			},
+		}
+	}
+</script>
+<style lang="scss" scoped>
+
+</style>

src/components/createCom/XhRadio.vue

+<!-- *******************  单选框  *******************  -->
 <template>
 	<view class="list">
 		<view v-for="(item,index) in settings" :key="index" :class="{'txt':true,'active':item===dataValue}" 

src/components/createCom/XhScan.vue

+<!-- *******************  扫码  *******************  -->
 <template>
 	<view class="">
 		<view class="u-flex">

src/components/createCom/XhSelect.vue

+<!-- *******************  单个下拉选择  *******************  -->
 <template>
 	<view>
 		<u-input v-model="dataValue" readOnly @click="show=true" type="select" />

src/pages/order/complete.vue

@@ -22,35 +22,44 @@
 						<view class="class-item" :key="groupIndex">
 							<view class="title">{{groupItem.groupName}}</view>
 							<view class="class-bd">
-								<u-form-item  v-for="(item,itemIndex) in groupItem.item" :key="itemIndex"
-									label-position="top"
-									:prop="item.fieldsName">
-									<view class="label" v-if="toLowerCase(item.fieldsType)!=='location'" @click="nextStep(item)">
+								<u-form-item v-for="(item,itemIndex) in groupItem.item" :key="itemIndex"
+									label-position="top" :prop="item.fieldsName">
+									<view class="label" v-if="item.fieldsType!=='location'">
 										<text class="required" v-if="item.required">*</text>
 										{{item.fieldsTitle}}
 									</view>
 									<template v-if="item.fieldsType">
-										<xh-input v-if="toLowerCase(item.fieldsType)==='input'" :groupIndex="groupIndex"
+										<xh-input v-if="typeToComponentType(item.fieldsType)==='input'" :groupIndex="groupIndex"
 											:itemIndex="itemIndex" :item="item" @value-change="fieldValueChange">
 										</xh-input>
-										<xh-radio v-else-if="toLowerCase(item.fieldsType)==='radio'" :groupIndex="groupIndex"
-											:itemIndex="itemIndex" :item="item" @value-change="fieldValueChange">
+										<xh-radio v-else-if="typeToComponentType(item.fieldsType)==='radio'"
+											:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item"
+											@value-change="fieldValueChange">
 										</xh-radio>
-										<xh-checkbox v-else-if="toLowerCase(item.fieldsType)==='checkbox'" :groupIndex="groupIndex"
-											:itemIndex="itemIndex" :item="item" @value-change="fieldValueChange">
+										<xh-checkbox v-else-if="typeToComponentType(item.fieldsType)==='checkbox'"
+											:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item"
+											@value-change="fieldValueChange">
 										</xh-checkbox>
-										<xh-select v-else-if="toLowerCase(item.fieldsType)==='select'" :groupIndex="groupIndex"
-											:itemIndex="itemIndex" :item="item" @value-change="fieldValueChange">
+										<xh-select v-else-if="typeToComponentType(item.fieldsType)==='select'"
+											:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item"
+											@value-change="fieldValueChange">
 										</xh-select>
-										<xh-files v-else-if="toLowerCase(item.fieldsType)==='file'" :groupIndex="groupIndex"
-											:itemIndex="itemIndex" :item="item" @value-change="fieldValueChange">
+										<xh-files v-else-if="typeToComponentType(item.fieldsType)==='file'"
+											:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item"
+											@value-change="fieldValueChange">
 										</xh-files>
-										<xh-location v-else-if="toLowerCase(item.fieldsType)==='location'" :groupIndex="groupIndex"
-											:itemIndex="itemIndex" :item="item" @value-change="fieldValueChange">
+										<xh-location v-else-if="typeToComponentType(item.fieldsType)==='location'"
+											:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item"
+											@value-change="fieldValueChange">
 										</xh-location>
-										<xh-scan v-else-if="toLowerCase(item.fieldsType)==='scan'" :groupIndex="groupIndex"
-											:itemIndex="itemIndex" :item="item" @value-change="fieldValueChange">
+										<xh-scan v-else-if="typeToComponentType(item.fieldsType)==='scan'"
+											:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item"
+											@value-change="fieldValueChange">
 										</xh-scan>
+										<xh-picker v-else-if="typeToComponentType(item.fieldsType)==='picker'"
+											:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item"
+											@value-change="fieldValueChange">
+										</xh-picker>
 									</template>
 								</u-form-item>
 							</view>
@@ -71,6 +80,7 @@
 	import XhFiles from '@/components/createCom/XhFiles.vue'
 	import XhLocation from '@/components/createCom/XhLocation.vue'
 	import XhScan from '@/components/createCom/XhScan.vue'
+	import XhPicker from '@/components/createCom/XhPicker.vue'
 	// import XhRadio from '@/components/createCom/XhRadio.vue'
 	export default {
 		data() {
@@ -125,7 +135,8 @@
 			XhSelect,
 			XhFiles,
 			XhLocation,
-			XhScan
+			XhScan,
+			XhPicker
 			// formCom
 		},
 		created() {
@@ -160,16 +171,41 @@
 				// 下一步
 				console.log(item, 'item')
 			},
-			fieldTypeStatus(type){
-				let typeArr = ['input','radio','checkbox','select','file']
-				let fieldsType = type.toLocaleLowerCase()
-				let flag = false
-				flag = typeArr.indexOf(fieldsType)>=0
-				return flag
-			},
-			toLowerCase(str){
-				str = str || ''
-				return str.toLocaleLowerCase()
+			typeToComponentType(type) {
+				// 将fieldType类型统一转换为公共组件判定类型
+				let formType = ''
+				type = type.toLocaleLowerCase()
+				switch (type) {
+					case 'text':
+					case 'password':
+					case 'textarea':
+					case 'number':
+						formType = 'input'
+						break
+					case 'select':
+						formType = 'select'
+						break
+					case 'checkbox':
+						formType = 'checkbox'
+						break
+					case 'file':
+						formType = 'file'
+						break
+					case 'location':
+						formType = 'location'
+						break
+					case 'scan':
+						formType = 'scan'
+						break
+					case 'picker':
+					case 'mutipicker':
+						formType = 'picker'
+						break
+					// case 'file':
+					// 	formType = 'XhFiles'
+					// 	break
+				}
+				return formType
 			},
 			// ------------------------- 以下方法为展示滚动切换 -------------------------
 			// 点击左边的栏目切换