diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue
index 689e1c8..1de8549 100644
--- a/components/index/video-item/index.vue
+++ b/components/index/video-item/index.vue
@@ -113,6 +113,7 @@
box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
.bubble {
position: relative;
+ border-radius: 20rpx;
background-color: #fff;
&::after {
position: absolute;
@@ -130,8 +131,7 @@
> view {
display: flex;
align-items: center;
- height: 52rpx;
- padding: 10rpx 20rpx;
+ padding: 20rpx 30rpx;
&:not(:last-child) {
border-bottom: 2rpx #ECECEC solid;
}
@@ -142,17 +142,17 @@
}
> image {
&:first-child {
- @include image-class($width: 21rpx, $height: 22rpx, $right: 12rpx);
+ @include image-class($width: 30rpx, $height: 30rpx, $right: 12rpx);
}
&:nth-child(2) {
- @include image-class($width: 22rpx, $height: 22rpx, $right: 12rpx);
+ @include image-class($width: 30rpx, $height: 30rpx, $right: 12rpx);
}
&:last-child {
- @include image-class($width: 24rpx, $height: 20rpx, $right: 9rpx);
+ @include image-class($width: 30rpx, $height: 30rpx, $right: 9rpx);
}
}
> text {
- font-size: 20rpx;
+ font-size: 24rpx;
color: rgba(51,51,51,1);
}
}
@@ -205,19 +205,18 @@ export default {
}).then(res => {
console.log(res)
if(res.errCode == 0) {
+ this.$u.toast(res.message);
this.$emit("getArticlelist");
- // this.$u.toast(res.message);
- } else {
- // this.$u.toast(res.message);
- }
+ }
})
},
articleCollect() {
this.$u.api.articleCollect({
article_id: this.item.article_id,
}).then(res => {
- console.log(res)
+ console.log(res);
if(res.errCode == 0) {
+ this.$u.toast(res.message);
this.$emit("getArticlelist");
}
})
@@ -229,6 +228,7 @@ export default {
}).then(res => {
// console.log(res)
if(res.errCode == 0) {
+ this.$u.toast(res.message);
this.$emit("getArticlelist");
}
})
diff --git a/components/remaining/remaining.vue b/components/remaining/remaining.vue
index 90389cf..612bd66 100644
--- a/components/remaining/remaining.vue
+++ b/components/remaining/remaining.vue
@@ -4,9 +4,8 @@
-
- abc
@@ -22,8 +21,8 @@
- 立即体验
+ 立即体验
@@ -72,7 +71,8 @@
background: ['color1', 'color2', 'color3'],
indicatorDots: true,
interval: 2000,
- duration: 500
+ duration: 500,
+ swiper_index: "",
};
},
onReady: function(res) {
@@ -133,6 +133,11 @@
}
});
},
+ // 立即体验
+ goNext() {
+ this.protocol = true;
+ this.banner = false;
+ },
// 我同意
to_agree() {
uni.setStorage({
@@ -203,8 +208,21 @@
.uni-padding-wrap{
// height: 400rpx;
}
+ .btn-init {
+ z-index: 1000;
+ position: absolute;
+ bottom: 100rpx;
+ right: 30%;
+ width: 300rpx;
+ height: 80rpx;
+ line-height: 80rpx;
+ text-align: center;
+ color: #fff;
+ border-radius: 40rpx;
+ background-color: #007AFF;
+ }
.welcome_jumpes {
- z-index: 10000;
+ z-index: 100;
position: absolute;
top: 80rpx;
right: 60rpx;
@@ -220,15 +238,6 @@
#myVideo {
width: 100%;
- .time {
- position: absolute;
- top: 0;
- left: 0;
- width: 10rpx;
- height: 10rpx;
- color: #fff;
- font-size: 30rpx;
- }
}
uni-video {
diff --git a/components/shop/list/item.vue b/components/shop/list/item.vue
index c33e26c..56bdefa 100644
--- a/components/shop/list/item.vue
+++ b/components/shop/list/item.vue
@@ -1,6 +1,6 @@
-
+
{{ info.goods_name }}
{{ info.goods_advword }}
@@ -44,13 +44,12 @@ export default {
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 75f9fef..6916d64 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "deming",
+ "name" : "德铭阳光",
"appid" : "__UNI__EBFF00A",
"description" : "",
"versionName" : "1.0.0",
@@ -105,7 +105,10 @@
"xhdpi" : "static/app/start/720x1242.png",
"xxhdpi" : "static/app/start/1080x1882.png"
},
- "iosStyle" : "storyboard"
+ "iosStyle" : "storyboard",
+ "ios" : {
+ "storyboard" : "static/CustomStoryboard.zip"
+ }
},
"icons" : {
"android" : {
@@ -115,16 +118,27 @@
"xxxhdpi" : "static/app/icon/192x192.png"
},
"ios" : {
- "appstore" : "static/app/icon/192x192.png",
+ "appstore" : "unpackage/res/icons/1024x1024.png",
"iphone" : {
- "app@2x" : "static/app/icon/144x144.png",
- "app@3x" : "static/app/icon/192x192.png",
- "spotlight@2x" : "static/app/icon/96x96.png",
- "spotlight@3x" : "static/app/icon/144x144.png",
- "settings@2x" : "static/app/icon/72x72.png",
- "settings@3x" : "static/app/icon/96x96.png",
- "notification@2x" : "static/app/icon/72x72.png",
- "notification@3x" : "static/app/icon/72x72.png"
+ "app@2x" : "unpackage/res/icons/120x120.png",
+ "app@3x" : "unpackage/res/icons/180x180.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png",
+ "spotlight@3x" : "unpackage/res/icons/120x120.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "settings@3x" : "unpackage/res/icons/87x87.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "notification@3x" : "unpackage/res/icons/60x60.png"
+ },
+ "ipad" : {
+ "app" : "unpackage/res/icons/76x76.png",
+ "app@2x" : "unpackage/res/icons/152x152.png",
+ "notification" : "unpackage/res/icons/20x20.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "proapp@2x" : "unpackage/res/icons/167x167.png",
+ "settings" : "unpackage/res/icons/29x29.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "spotlight" : "unpackage/res/icons/40x40.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png"
}
}
}
diff --git a/pageA/register/register.vue b/pageA/register/register.vue
index a9c3b49..c449518 100644
--- a/pageA/register/register.vue
+++ b/pageA/register/register.vue
@@ -103,6 +103,7 @@
},
// 用户注册
loginIns(){
+ let me = this;
let type_phone = this.$u.test.mobile( this.member_mobile)
if( this.member_mobile == ''){
this.$refs.uToast.show({
diff --git a/pageB/photo/index.vue b/pageB/photo/index.vue
index 8836c36..aa21314 100644
--- a/pageB/photo/index.vue
+++ b/pageB/photo/index.vue
@@ -6,7 +6,7 @@
-
+
@@ -32,7 +32,7 @@
-
+
{{ item.member_nickname }}
{{ item.create_time }}
@@ -83,7 +83,7 @@
-
+
{{ item.goods_advword }}
{{ item.goods_name }}
@@ -98,7 +98,7 @@
.photo{
width: 100%;
height: 100%;
- background-color: #ececec;
+ background-color: #000000;
.back{
padding-top: 28rpx;
padding-right: 31rpx;
@@ -106,16 +106,15 @@
}
.swiper{
width: 750rpx;
- height: 702rpx;
- margin-top: 102rpx;
+ height: 700rpx;
+ margin-top: 140rpx;
image{
width: 100%;
height: 100%;
}
}
.bottom{
- width: 100%;
- margin-top: 150rpx;
+ margin-top: 180rpx;
padding: 20rpx 30rpx;
background-color: #fff;
.item{
@@ -146,10 +145,7 @@
}
.info{
margin: 20rpx 0;
- display: -webkit-box;
- -webkit-box-orient: vertical;
- -webkit-line-clamp: 2;
- overflow: hidden;
+ line-height: 1.2;
font-size: 28rpx;
}
.box {
diff --git a/pageB/search/out.vue b/pageB/search/out.vue
index bd3b087..f56a0da 100644
--- a/pageB/search/out.vue
+++ b/pageB/search/out.vue
@@ -1,15 +1,18 @@
-
-
+
+
-
-
+
+
@@ -19,7 +22,7 @@
- 销量
+ 销量
价格
@@ -29,163 +32,162 @@
好评
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- D
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
+ }
+
diff --git a/pages/information/information.vue b/pages/information/information.vue
index 1c411cc..435bdc8 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -9,7 +9,7 @@
-
+
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 1d42951..209350d 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -35,7 +35,7 @@
-
+
@@ -299,19 +299,11 @@
}
.fenlei {
- padding: 30rpx;
- background-color: #ffffff;
display: flex;
flex-wrap: wrap;
+ padding: 30rpx;
margin-bottom: 20rpx;
-
- >view {
- margin-bottom: 30rpx;
-
- &:not(:nth-child(5n)) {
- margin-right: 42rpx;
- }
- }
+ background-color: #ffffff;
}
.activity-view {
diff --git a/static/CustomStoryboard.zip b/static/CustomStoryboard.zip
new file mode 100644
index 0000000..a540b69
Binary files /dev/null and b/static/CustomStoryboard.zip differ