Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李俊赕
self-support
Commits
376b4247
Commit
376b4247
authored
Apr 20, 2021
by
Facius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
b4d6820e
4ba29899
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
78 additions
and
4 deletions
+78
-4
classify.data.js
src/common/classify.data.js
+4
-1
XhFiles.vue
src/components/createCom/XhFiles.vue
+1
-1
XhLocation.vue
src/components/createCom/XhLocation.vue
+1
-1
XhScan.vue
src/components/createCom/XhScan.vue
+65
-0
complete.vue
src/pages/order/complete.vue
+6
-1
utils.js
src/plugins/uploader/request/upload/utils.js
+1
-0
No files found.
src/common/classify.data.js
View file @
376b4247
...
...
@@ -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
...
...
src/components/createCom/XhFiles.vue
View file @
376b4247
...
...
@@ -58,7 +58,7 @@
// 直接打开相册
let
config
=
{
options
:{
con
sourceType
:[
'album'
],
//['album', 'camera']
sourceType
:[
'album'
],
//['album', 'camera']
}
}
await
this
.
chooseImage
(
'qiniu'
,
config
)
...
...
src/components/createCom/XhLocation.vue
View file @
376b4247
...
...
@@ -10,7 +10,7 @@
<
script
>
import
objMixin
from
'./objMixin'
export
default
{
name
:
'Xh
Radio
'
,
name
:
'Xh
Location
'
,
components
:
{},
mixins
:
[
objMixin
],
props
:
{},
...
...
src/components/createCom/XhScan.vue
0 → 100644
View file @
376b4247
<
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=
"scanCode"
>
<view
class=
"txt u-flex-1"
>
扫描二维码(仅挚达充电桩可扫描)
</view>
<u-icon
name=
"arrow-right"
color=
"#666"
size=
"28"
></u-icon>
</view>
</view>
</
template
>
<
script
>
import
stringMixin
from
'./stringMixin'
export
default
{
name
:
'XhScan'
,
components
:
{},
mixins
:
[
stringMixin
],
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
:
{
scanCode
(
type
){
const
self
=
this
// qrCode 二维码;barCode 条形码
let
scanType
=
type
&&
[
type
]
||
[
'qrCode'
]
uni
.
scanCode
({
// scanType: scanType,
success
:
function
(
res
)
{
self
.
dataValue
=
res
.
result
self
.
valueChange
(
res
.
result
)
// console.log('条码类型:' + res.scanType);
// console.log('条码内容:' + res.result);
}
});
},
// setValue(txt) {
// this.valueChange(this.dataValue)
// }
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
.required
{
padding-right
:
10rpx
;
font-size
:
28rpx
;
line-height
:
40rpx
;
color
:
#fa3534
;
}
</
style
>
src/pages/order/complete.vue
View file @
376b4247
...
...
@@ -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
()
{
...
...
src/plugins/uploader/request/upload/utils.js
View file @
376b4247
...
...
@@ -16,6 +16,7 @@ export const randomChar = function(l, url = "") {
}
//图片选择
export
const
chooseImage
=
function
(
data
)
{
console
.
log
(
data
,
'data-chooseImage'
)
return
new
Promise
((
resolve
,
reject
)
=>
{
uni
.
chooseImage
({
count
:
data
.
count
||
9
,
//默认9
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment