Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wechat_baking
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huahua
wechat_baking
Commits
ccb579bb
Commit
ccb579bb
authored
Nov 18, 2022
by
huahua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
0fc82f7d
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
12 deletions
+22
-12
pages/index/index.vue
+0
-0
pages/index/js/drag.js
+1
-1
pages/index/machineDetail.vue
+1
-0
pages/index/switchGoods.vue
+19
-10
pages/mall/lineUp.vue
+1
-1
pages/mall/size.vue
+0
-0
No files found.
pages/index/index.vue
View file @
ccb579bb
This diff is collapsed.
Click to expand it.
pages/index/js/drag.js
View file @
ccb579bb
...
@@ -3,7 +3,7 @@ const drag = {
...
@@ -3,7 +3,7 @@ const drag = {
* 部件缩放中事件四角缩放
* 部件缩放中事件四角缩放
*/
*/
scaleMove
(
e
,
item
,
data
,
allLineListData
,
designWidth
,
designHeight
)
{
scaleMove
(
e
,
item
,
data
,
allLineListData
,
designWidth
,
designHeight
)
{
console
.
log
(
item
)
item
.
isShowLineV
=
false
;
//初始化默认不显示
item
.
isShowLineV
=
false
;
//初始化默认不显示
item
.
isShowLineH
=
false
;
//初始化默认不显示
item
.
isShowLineH
=
false
;
//初始化默认不显示
var
minwwidth
=
20
var
minwwidth
=
20
...
...
pages/index/machineDetail.vue
View file @
ccb579bb
...
@@ -116,6 +116,7 @@
...
@@ -116,6 +116,7 @@
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
'../mall/size?machine_id='
+
this
.
machine_id
+
url
:
'../mall/size?machine_id='
+
this
.
machine_id
+
// + "&title=" + item.title + "&real_width=" + item.key +
// + "&title=" + item.title + "&real_width=" + item.key +
"&isFirstPage=true"
+
"&machineDetail="
+
JSON
.
stringify
(
this
.
list
)
"&machineDetail="
+
JSON
.
stringify
(
this
.
list
)
// url: '../index/size?machine_id=' + this.machine_id +
// url: '../index/size?machine_id=' + this.machine_id +
// '&key=' + this.key;
// '&key=' + this.key;
...
...
pages/index/switchGoods.vue
View file @
ccb579bb
...
@@ -6,20 +6,18 @@
...
@@ -6,20 +6,18 @@
@
click=
"closeView()"
>
@
click=
"closeView()"
>
</view>
</view>
<view
<view
style=
" width: 562upx; border-radius: 20upx; height: 900upx; z-index: 998; position: absolute ;margin:auto; top:0; right: 0; left: 0; bottom: 0;flex-direction: column"
>
style=
" width: 562upx; border-radius: 20upx; height: 900upx; z-index: 998; position: absolute ;margin:auto; top:0; right: 0; left: 0; bottom: 0;flex-direction: column"
>
<image
src=
"../../static/icon_home_good_back.png"
style=
"width: 562upx; border-radius: 20upx;
<image
src=
"../../static/icon_home_good_back.png"
style=
"width: 562upx; border-radius: 20upx;
height: 720upx;
height: 720upx;
left:50%;
left:50%;
top:50%;
top:50%;
transform: translate(-50%,-50%);
transform: translate(-50%,-50%);
position: absolute; "
/>
position: absolute; "
/>
<view
style=
"position: absolute;
<view
style=
"position: absolute;
width: 562upx; height:720upx;
width: 562upx; height:720upx;
top: 0; "
>
top: 0; "
>
<view
style=
"
<view
style=
"
width: 200upx;
width: 200upx;
height: 120upx;
height: 120upx;
...
@@ -55,7 +53,7 @@
...
@@ -55,7 +53,7 @@
position: relative;
position: relative;
margin: 10upx;"
>
margin: 10upx;"
>
<view
:class=
"[sizeCurrentIndexTop == index? 'size-item-select':'size-item-no-select' ]"
>
<view
:class=
"[sizeCurrentIndexTop == index? 'size-item-select':'size-item-no-select' ]"
>
{{
item
!=
null
?
item
.
title
:
''
}}
{{
item
!=
null
?
item
.
title
:
''
}}
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -72,7 +70,7 @@
...
@@ -72,7 +70,7 @@
margin-top:60upx;
margin-top:60upx;
text-align: center;"
>
确定
</view>
text-align: center;"
>
确定
</view>
<view
@
click=
"toCustomSize()"
style=
"width: 289upx;
<view
v-if=
"isShowCustomize"
@
click=
"toCustomSize()"
style=
"width: 289upx;
height: 84upx;
height: 84upx;
color: #F29F3D;
color: #F29F3D;
font-size: 32upx;
font-size: 32upx;
...
@@ -98,13 +96,14 @@
...
@@ -98,13 +96,14 @@
goodCurrentIndexTop
:
0
,
//上面商品选中
goodCurrentIndexTop
:
0
,
//上面商品选中
sizeCurrentIndexTop
:
0
,
//下面尺寸选中
sizeCurrentIndexTop
:
0
,
//下面尺寸选中
selectGoodSize
:
null
,
//选中商品尺寸
selectGoodSize
:
null
,
//选中商品尺寸
isShowCustomize
:
tru
e
,
//是否自定义选中
isShowCustomize
:
fals
e
,
//是否自定义选中
};
};
},
},
mounted
()
{
},
mounted
()
{
methods
:
{
},
methods
:
{
//自定义尺寸
//自定义尺寸
toCustomSize
()
{
toCustomSize
()
{
...
@@ -144,12 +143,14 @@
...
@@ -144,12 +143,14 @@
}
}
},
},
//商品点击事件
//商品点击事件
sizeclick
(
item
,
index
)
{
sizeclick
(
item
,
index
)
{
this
.
selectGoodSize
=
item
this
.
selectGoodSize
=
item
this
.
sizeCurrentIndexTop
=
index
;
this
.
sizeCurrentIndexTop
=
index
;
},
},
//打开页面
//打开页面
open
(
machineId
,
isShowCustomize
)
{
open
(
machineId
,
isShowCustomize
)
{
if
(
isShowCustomize
)
{
if
(
isShowCustomize
)
{
...
@@ -161,6 +162,7 @@
...
@@ -161,6 +162,7 @@
this
.
getGooods
();
this
.
getGooods
();
},
},
//获取商品列表
//获取商品列表
getGooods
()
{
getGooods
()
{
let
that
=
this
;
let
that
=
this
;
...
@@ -186,7 +188,6 @@
...
@@ -186,7 +188,6 @@
}
else
{
}
else
{
this
.
isShow
=
true
;
this
.
isShow
=
true
;
}
}
}).
catch
(
err
=>
{
}).
catch
(
err
=>
{
this
.
isShow
=
false
;
this
.
isShow
=
false
;
uni
.
showToast
({
uni
.
showToast
({
...
@@ -207,6 +208,13 @@
...
@@ -207,6 +208,13 @@
},
},
options
(
options
){
},
}
}
</
script
>
</
script
>
...
@@ -253,4 +261,5 @@
...
@@ -253,4 +261,5 @@
text-align
:
center
;
text-align
:
center
;
border
:
2
upx
transparent
solid
;
border
:
2
upx
transparent
solid
;
}
}
</
style
>
</
style
>
pages/mall/lineUp.vue
View file @
ccb579bb
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
<view
style=
"text-align: left; font-size: 30upx; color: #333; line-height: 80upx;font-weight: 600; margin-top: 20upx;"
>
排队中
</view>
<view
style=
"text-align: left; font-size: 30upx; color: #333; line-height: 80upx;font-weight: 600; margin-top: 20upx;"
>
排队中
</view>
</view>
</view>
<view
style=
"font-size: 29upx; color: #333333; margin-top: 20upx; font-weight: 600;"
>
<view
style=
"font-size: 29upx; color: #333333; margin-top: 20upx; font-weight: 600;"
>
{{
designer
.
goods_name
||
''
}}
{{
designer
.
goods_specs
||
''
}}
{{
designer
.
customize_size_id
==
0
?
designer
.
goods_name
||
''
:
''
}}
{{
designer
.
goods_specs
||
''
}}
</view>
</view>
</view>
</view>
<view
style=
"width: 90%;font-size: 28upx; margin-top: 70upx; font-weight: 550; text-align: right; font-size: 36upx; color: #333; margin-right: 30upx;"
>
<view
style=
"width: 90%;font-size: 28upx; margin-top: 70upx; font-weight: 550; text-align: right; font-size: 36upx; color: #333; margin-right: 30upx;"
>
...
...
pages/mall/size.vue
View file @
ccb579bb
This diff is collapsed.
Click to expand it.
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