merge
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,3 +1,4 @@
|
|||||||
/unpackage
|
/unpackage
|
||||||
/node_modules
|
/node_modules
|
||||||
/.hbuilderx
|
/.hbuilderx
|
||||||
|
/unpackage/dist
|
||||||
|
|||||||
@@ -110,7 +110,7 @@
|
|||||||
this.orderDetail = res.order_detail;
|
this.orderDetail = res.order_detail;
|
||||||
this.goods = res.item;
|
this.goods = res.item;
|
||||||
let collage = res.collage;
|
let collage = res.collage;
|
||||||
collage.score = 100
|
collage.score = (res.collage.number - res.collage.surplus)/res.collage.number * 100
|
||||||
this.collage = collage;
|
this.collage = collage;
|
||||||
this.users = res.users;
|
this.users = res.users;
|
||||||
this.express = res.order_detail.express;
|
this.express = res.order_detail.express;
|
||||||
|
|||||||
16
unpackage/dist/build/app-plus/app-service.js
vendored
16
unpackage/dist/build/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
8
unpackage/dist/build/app-plus/app-view.js
vendored
8
unpackage/dist/build/app-plus/app-view.js
vendored
File diff suppressed because one or more lines are too long
8412
unpackage/dist/dev/app-plus/app-service.js
vendored
8412
unpackage/dist/dev/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
7056
unpackage/dist/dev/app-plus/app-view.js
vendored
7056
unpackage/dist/dev/app-plus/app-view.js
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user