diff --git a/src/common/classify.data.js b/src/common/classify.data.js index f8e0e5db03a2676bb9730569d46692ed54b8a82d..093613f2de81eec111138fdddf9e1e4b98c920cb 100644 --- a/src/common/classify.data.js +++ b/src/common/classify.data.js @@ -55,7 +55,10 @@ export default [{ "cat": 10 }, { - "fieldsTitle": "连衣裙", + "fieldsTitle": "充电桩编ç ", + "fieldsName": "scan", + "fieldsType": "scan", + "required": true, "key": "连衣裙", "icon": "https://cdn.uviewui.com/uview/common/classify/1/7.jpg", "cat": 10 diff --git a/src/components/createCom/XhLocation.vue b/src/components/createCom/XhLocation.vue index 78c30ea52087e1003dbfe86b526edff249e7c1cf..9c425efa86b293dffdb5b57da6c4ab233e2cffc1 100644 --- a/src/components/createCom/XhLocation.vue +++ b/src/components/createCom/XhLocation.vue @@ -10,7 +10,7 @@ <script> import objMixin from './objMixin' export default { - name: 'XhRadio', + name: 'XhLocation', components: {}, mixins: [objMixin], props: {}, diff --git a/src/components/createCom/XhScan.vue b/src/components/createCom/XhScan.vue new file mode 100644 index 0000000000000000000000000000000000000000..f03fd1ea088e85921adfbed1abaa4d4f74bb35f9 --- /dev/null +++ b/src/components/createCom/XhScan.vue @@ -0,0 +1,82 @@ +<template> + <view class=""> + <view class="u-flex"> + 请输入:<u-input class="u-flex-1" v-model="dataValue" @input="valueChange" type="text" /> + </view> + <view class="u-flex" @click="getScan('')"> + <view class="txt u-flex-1">扫æäºŒç»´ç ï¼ˆä»…æŒšè¾¾å……ç”µæ¡©å¯æ‰«æï¼‰</view> + <u-icon name="arrow-right" color="#666" size="28"></u-icon> + </view> +<!-- <view class="list u-flex u-row-between"> + + <text class="required" v-if="item.required">*</text> + <view class="u-m-r-20">{{item.fieldsTitle}}</view> + <view class="u-flex-1">{{valueTxt || ''}}</view> + <u-button type="primary" size="mini" @click="$u.debounce(getLocation,1000)">默认按钮</u-button> + </view> --> + </view> + +</template> + +<script> + import objMixin from './objMixin' + export default { + name: 'XhScan', + components: {}, + mixins: [objMixin], + props: {}, + filters:{}, + data() { + return {} + }, + computed: { + valueTxt() { + let str = '' + const dataValue = this.dataValue + if(dataValue && dataValue.length>1){ + str = 'ç»åº¦ï¼š'+dataValue[0]+','+'维度:'+dataValue[1] + } + return str + } + }, + watch: {}, + mounted() {}, + methods: { + getScan(type){ + uni.scanCode({ + scanType: ['barCode'], + success: function (res) { + console.log('æ¡ç 类型:' + res.scanType); + console.log('æ¡ç 内容:' + res.result); + } + }); + }, + getLocation() { + let self = this + const dataValue = this.dataValue || [] + const waterInfo = this.waterInfo + uni.getLocation({ + type: 'gcj02', + success: function(res) { + dataValue.push(res.longitude) + dataValue.push(res.latitude) + self.dataValue = dataValue + self.setValue(dataValue) + }, + fail(err) {} + }); + }, + setValue(txt) { + this.valueChange(this.dataValue) + } + } + } +</script> +<style lang="scss" scoped> + .required { + padding-right: 10rpx; + font-size: 28rpx; + line-height: 40rpx; + color: #fa3534; + } +</style> diff --git a/src/pages/order/complete.vue b/src/pages/order/complete.vue index bbe8fbe67af72fef36722ccdfee09f1ce3f3a5e2..2b33b34942f9b2af3b8a605a366c9a586374d70a 100644 --- a/src/pages/order/complete.vue +++ b/src/pages/order/complete.vue @@ -48,6 +48,9 @@ <xh-location v-else-if="toLowerCase(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> </template> </u-form-item> </view> @@ -67,6 +70,7 @@ import XhSelect from '@/components/createCom/XhSelect.vue' import XhFiles from '@/components/createCom/XhFiles.vue' import XhLocation from '@/components/createCom/XhLocation.vue' + import XhScan from '@/components/createCom/XhScan.vue' // import XhRadio from '@/components/createCom/XhRadio.vue' export default { data() { @@ -120,7 +124,8 @@ XhCheckbox, XhSelect, XhFiles, - XhLocation + XhLocation, + XhScan // formCom }, created() {