From 1a6905045d38bb50b0c6554c3440bdfd339c8d23 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 30 七月 2024 19:13:46 +0800
Subject: [PATCH] ‘’
---
wechat_jiaxuan/pages/userinfo/index.wxml | 2
wechat_jiaxuan/pages/userinfo/collect.less | 3
wechat_staff/pages/store/staff.less | 3
wechat_jiaxuan/components/disProduct/index.less | 1
wechat_jiaxuan/app.js | 2
wechat_jiaxuan/pages/store/staff.wxss | 12 +
wechat_jiaxuan/pages/store/staff.less | 3
wechat_staff/pages/userinfo/index.wxml | 2
wechat_staff/pages/userinfo/collect.wxss | 3
wechat_jiaxuan/components/disCase/index.wxss | 1
wechat_jiaxuan/pages/userinfo/index.less | 6 +
wechat_staff/pages/detailDis/product.wxss | 3
wechat_jiaxuan/pages/detailDis/realpic.less | 3
wechat_jiaxuan/pages/detailDis/case.js | 22 +--
wechat_jiaxuan/project.private.config.json | 2
wechat_jiaxuan/components/disCase/index.less | 1
wechat_jiaxuan/components/disRealpic/index.wxml | 8
wechat_staff/pages/detailDis/product.less | 3
wechat_jiaxuan/pages/userinfo/mysub.wxss | 3
wechat_jiaxuan/pages/userinfo/collect.wxss | 3
wechat_staff/pages/userinfo/collect.less | 3
wechat_jiaxuan/pages/userinfo/index.wxss | 6 +
wechat_staff/pages/detailDis/case.wxss | 1
wechat_jiaxuan/pages/detailDis/realpic.js | 14 +-
wechat_staff/pages/userinfo/collect.js | 69 ++++++++-----
wechat_staff/pages/detailDis/realpic.less | 2
wechat_jiaxuan/pages/userinfo/mysub.less | 3
wechat_jiaxuan/pages/userinfo/favorite.less | 3
wechat_jiaxuan/components/disRealpic/index.less | 2
wechat_jiaxuan/pages/store/store.less | 6
wechat_jiaxuan/pages/detailDis/product.wxss | 3
wechat_staff/pages/consult/detail.wxss | 1
wechat_jiaxuan/pages/detailDis/realpic.wxss | 3
wechat_jiaxuan/pages/userinfo/favorite.wxss | 3
wechat_jiaxuan/pages/store/store.wxss | 4
wechat_jiaxuan/pages/consult/detail.wxss | 1
wechat_staff/pages/sets/index.js | 13 +-
wechat_jiaxuan/components/disCase/index.js | 4
wechat_jiaxuan/pages/consult/detail.less | 1
wechat_staff/pages/detailDis/realpic.wxss | 2
wechat_staff/pages/detailDis/case.less | 1
wechat_staff/components/videoPlay/index.wxml | 2
wechat_jiaxuan/pages/detailDis/case.wxss | 3
wechat_jiaxuan/components/disCase/index.wxml | 4
wechat_staff/components/disCase/index.js | 5
wechat_jiaxuan/pages/detailDis/product.less | 3
wechat_jiaxuan/pages/detailDis/case.less | 3
wechat_staff/pages/consult/detail.less | 1
wechat_staff/pages/store/staff.wxss | 3
wechat_jiaxuan/components/disRealpic/index.wxss | 2
wechat_jiaxuan/components/videoPlay/index.wxml | 2
wechat_jiaxuan/components/disProduct/index.wxss | 1
52 files changed, 164 insertions(+), 96 deletions(-)
diff --git a/wechat_jiaxuan/app.js b/wechat_jiaxuan/app.js
index 50a7179..1aa5ea5 100644
--- a/wechat_jiaxuan/app.js
+++ b/wechat_jiaxuan/app.js
@@ -10,7 +10,7 @@
App({
globalData,
onLaunch: function (op) {
- console.log('options', op.query.scene)
+ console.log('options', op.query)
let pathMap = [
'/pages/detailDis/product',
'/pages/detailDis/case',
diff --git a/wechat_jiaxuan/components/disCase/index.js b/wechat_jiaxuan/components/disCase/index.js
index 695fc91..9c5c9cb 100644
--- a/wechat_jiaxuan/components/disCase/index.js
+++ b/wechat_jiaxuan/components/disCase/index.js
@@ -24,6 +24,7 @@
},
attached() {
this.getCatelist()
+ this.getList()
},
methods: {
getCatelist() {
@@ -35,9 +36,6 @@
this.setData({
cateList: res.data
})
- setTimeout(() => {
- this.getList()
- }, 300)
}
})
},
diff --git a/wechat_jiaxuan/components/disCase/index.less b/wechat_jiaxuan/components/disCase/index.less
index 424ef72..b8b7ee2 100644
--- a/wechat_jiaxuan/components/disCase/index.less
+++ b/wechat_jiaxuan/components/disCase/index.less
@@ -171,6 +171,7 @@
margin-left: 12rpx;
.icon{
width: 28rpx;
+ height: 26rpx;
margin-right: 8rpx;
}
.num{
diff --git a/wechat_jiaxuan/components/disCase/index.wxml b/wechat_jiaxuan/components/disCase/index.wxml
index 1d3bcb5..12bc189 100644
--- a/wechat_jiaxuan/components/disCase/index.wxml
+++ b/wechat_jiaxuan/components/disCase/index.wxml
@@ -44,9 +44,9 @@
<view class="content">
<view class="name">{{ item.title }}</view>
<view class="info">
- <image wx:if="{{ !item.collection }}" data-code="like" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:if="{{ !item.isCollection }}" data-code="like" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
<image wx:else data-code="like_cancel" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
- <text class="num {{item.collection ? 'primary' : ''}}">{{ item.collectCount }}</text>
+ <text class="num {{item.isCollection ? 'primary' : ''}}">{{ item.collectCount }}</text>
<image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
<text>{{ item.viewCount }}</text>
</view>
diff --git a/wechat_jiaxuan/components/disCase/index.wxss b/wechat_jiaxuan/components/disCase/index.wxss
index e9703ef..65dbd4f 100644
--- a/wechat_jiaxuan/components/disCase/index.wxss
+++ b/wechat_jiaxuan/components/disCase/index.wxss
@@ -171,6 +171,7 @@
}
.main_content .goods_list .item .info .icon {
width: 28rpx;
+ height: 26rpx;
margin-right: 8rpx;
}
.main_content .goods_list .item .info .num {
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index 24d8f07..41f58ed 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -215,6 +215,7 @@
.icon {
width: 28rpx;
+ height: 26rpx;
margin-right: 8rpx;
}
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index 9b4d36d..f3311d2 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -197,6 +197,7 @@
}
.main_content .main_right .goods_list .item .info .icon {
width: 28rpx;
+ height: 26rpx;
margin-right: 8rpx;
}
.main_content .main_right .goods_list .item .info .num {
diff --git a/wechat_jiaxuan/components/disRealpic/index.less b/wechat_jiaxuan/components/disRealpic/index.less
index e5dedc9..4ccc41d 100644
--- a/wechat_jiaxuan/components/disRealpic/index.less
+++ b/wechat_jiaxuan/components/disRealpic/index.less
@@ -183,6 +183,7 @@
.icon {
width: 24rpx;
+ height: 24rpx;
margin-right: 4rpx;
}
}
@@ -223,6 +224,7 @@
.icon {
width: 28rpx;
+ height: 26rpx;
margin-right: 8rpx;
}
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxml b/wechat_jiaxuan/components/disRealpic/index.wxml
index a42d9be..65e6908 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxml
+++ b/wechat_jiaxuan/components/disRealpic/index.wxml
@@ -50,10 +50,10 @@
<view class="name">{{ item.title }}</view>
</view>
<view class="info">
- <image wx:if="{{ !item.collection }}" data-code="like" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
- <image wx:else data-code="like_cancel" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
- <text class="num {{item.collection ? 'primary' : ''}}">{{ item.collectCount }}</text>
- <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <image wx:if="{{ !item.isCollection }}" data-code="like" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png"></image>
+ <image wx:else data-code="like_cancel" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collected.png"></image>
+ <text class="num {{item.isCollection ? 'primary' : ''}}">{{ item.collectCount }}</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" ></image>
<text>{{ item.viewCount }}</text>
</view>
</view>
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxss b/wechat_jiaxuan/components/disRealpic/index.wxss
index ef192a3..9cce23e 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxss
+++ b/wechat_jiaxuan/components/disRealpic/index.wxss
@@ -169,6 +169,7 @@
}
.main_content .goods_list .item .img_wrap .full .icon {
width: 24rpx;
+ height: 24rpx;
margin-right: 4rpx;
}
.main_content .goods_list .item .img_wrap .img {
@@ -202,6 +203,7 @@
}
.main_content .goods_list .item .info .icon {
width: 28rpx;
+ height: 26rpx;
margin-right: 8rpx;
}
.main_content .goods_list .item .info .num {
diff --git a/wechat_jiaxuan/components/videoPlay/index.wxml b/wechat_jiaxuan/components/videoPlay/index.wxml
index 75e31f2..3ea0b5f 100644
--- a/wechat_jiaxuan/components/videoPlay/index.wxml
+++ b/wechat_jiaxuan/components/videoPlay/index.wxml
@@ -1,5 +1,5 @@
<view wx:if="{{ isVShow }}" bind:tap="onClose" class="video_content">
<view class="video">
- <video id="myVideo" src="{{videoSrc}}" autoplay show-fullscreen-btn show-play-btn ></video>
+ <video id="myVideo" src="{{videoSrc}}" autoplay show-play-btn ></video>
</view>
</view >
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/consult/detail.less b/wechat_jiaxuan/pages/consult/detail.less
index 951043a..3358527 100644
--- a/wechat_jiaxuan/pages/consult/detail.less
+++ b/wechat_jiaxuan/pages/consult/detail.less
@@ -60,7 +60,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
border-radius: 8rpx;
.sheji{
width: 28rpx;
diff --git a/wechat_jiaxuan/pages/consult/detail.wxss b/wechat_jiaxuan/pages/consult/detail.wxss
index 773064d..c6b3e84 100644
--- a/wechat_jiaxuan/pages/consult/detail.wxss
+++ b/wechat_jiaxuan/pages/consult/detail.wxss
@@ -58,7 +58,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
border-radius: 8rpx;
}
.footer .sub_btn .sheji {
diff --git a/wechat_jiaxuan/pages/detailDis/case.js b/wechat_jiaxuan/pages/detailDis/case.js
index 4e5301a..b8facd2 100644
--- a/wechat_jiaxuan/pages/detailDis/case.js
+++ b/wechat_jiaxuan/pages/detailDis/case.js
@@ -21,6 +21,7 @@
this.setData({
bottomLift: app.bottomLift
})
+
if(options.origin && options.origin == 'b'){
this.setData({ origin: 'b' })
}
@@ -44,13 +45,13 @@
console.log('鐐瑰嚮浜嗗垎浜�');
actionDo({ actionType: 'share', id: this.data.info.id })
},
- // onShareAppMessage: function () {
- // // let { productDetail, userInfo } = this.data
- // return {
- // title: productDetail.title,
- // path: '/pages/index/index?id=' + productDetail.id + '&shareuserid=' + userInfo.id + '&type=0'
- // }
- // },
+ onShareAppMessage: function () {
+ let { info } = this.data
+ console.log('鐐瑰嚮浜嗗垎浜�')
+ return {
+ path: '/pages/detailDis/case?id=' + info.id + '&userId=' + info.users.id
+ }
+ },
handleAction(e){
const actionType = e.currentTarget.dataset.code
const { info } = this.data
@@ -141,11 +142,4 @@
onReachBottom() {
},
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/case.less b/wechat_jiaxuan/pages/detailDis/case.less
index e57e9b4..c7a62be 100644
--- a/wechat_jiaxuan/pages/detailDis/case.less
+++ b/wechat_jiaxuan/pages/detailDis/case.less
@@ -40,6 +40,7 @@
justify-content: center;
.icon{
width: 24rpx;
+ height: 24rpx;
margin-right: 4rpx;
}
}
@@ -123,7 +124,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
border-radius: 8rpx;
.sheji{
width: 28rpx;
@@ -140,6 +140,7 @@
margin-right: 48rpx;
.icon {
width: 44rpx;
+ height: 44rpx;
}
}
}
diff --git a/wechat_jiaxuan/pages/detailDis/case.wxss b/wechat_jiaxuan/pages/detailDis/case.wxss
index a52f5de..a5ff355 100644
--- a/wechat_jiaxuan/pages/detailDis/case.wxss
+++ b/wechat_jiaxuan/pages/detailDis/case.wxss
@@ -40,6 +40,7 @@
}
.container .fullview_wrap .full .icon {
width: 24rpx;
+ height: 24rpx;
margin-right: 4rpx;
}
.container .img {
@@ -111,7 +112,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
border-radius: 8rpx;
}
.footer .sub_btn .sheji {
@@ -129,6 +129,7 @@
}
.footer .item .icon {
width: 44rpx;
+ height: 44rpx;
}
.share_btn {
position: fixed;
diff --git a/wechat_jiaxuan/pages/detailDis/product.less b/wechat_jiaxuan/pages/detailDis/product.less
index 0dffc97..4dffe7c 100644
--- a/wechat_jiaxuan/pages/detailDis/product.less
+++ b/wechat_jiaxuan/pages/detailDis/product.less
@@ -88,6 +88,8 @@
}
.main_content {
+ position: relative;
+ bottom: 14rpx;
padding: 52rpx 40rpx 40rpx;
border-radius: 16rpx 16rpx 0rpx 0rpx;
background-color: #fff;
@@ -278,7 +280,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
border-radius: 8rpx;
.sheji{
width: 28rpx;
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxss b/wechat_jiaxuan/pages/detailDis/product.wxss
index 8eec784..6351ef8 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxss
+++ b/wechat_jiaxuan/pages/detailDis/product.wxss
@@ -81,6 +81,8 @@
border-radius: 8rpx;
}
.main_content {
+ position: relative;
+ bottom: 14rpx;
padding: 52rpx 40rpx 40rpx;
border-radius: 16rpx 16rpx 0rpx 0rpx;
background-color: #fff;
@@ -255,7 +257,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
border-radius: 8rpx;
}
.footer .sub_btn .sheji {
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.js b/wechat_jiaxuan/pages/detailDis/realpic.js
index 94714ac..5cdab38 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.js
+++ b/wechat_jiaxuan/pages/detailDis/realpic.js
@@ -149,11 +149,11 @@
onReachBottom() {
},
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
-
- }
+ onShareAppMessage: function () {
+ let { info } = this.data
+ console.log('鐐瑰嚮浜嗗垎浜�')
+ return {
+ path: '/pages/detailDis/realpic?id=' + info.id + '&userId=' + info.users.id
+ }
+ },
})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.less b/wechat_jiaxuan/pages/detailDis/realpic.less
index 7d8b695..9addc52 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.less
+++ b/wechat_jiaxuan/pages/detailDis/realpic.less
@@ -2,6 +2,7 @@
padding: 0 40rpx 220rpx;
.info_item{
width: 100%;
+ margin-bottom: 20rpx;
}
.main_title {
font-weight: 500;
@@ -61,7 +62,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
border-radius: 8rpx;
.sheji{
width: 28rpx;
@@ -78,6 +78,7 @@
margin-right: 48rpx;
.icon {
width: 44rpx;
+ height: 44rpx;
}
}
}
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxss b/wechat_jiaxuan/pages/detailDis/realpic.wxss
index dc8fc20..0384b12 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.wxss
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxss
@@ -3,6 +3,7 @@
}
.container .info_item {
width: 100%;
+ margin-bottom: 20rpx;
}
.container .main_title {
font-weight: 500;
@@ -57,7 +58,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
border-radius: 8rpx;
}
.footer .sub_btn .sheji {
@@ -75,6 +75,7 @@
}
.footer .item .icon {
width: 44rpx;
+ height: 44rpx;
}
.share_btn {
position: fixed;
diff --git a/wechat_jiaxuan/pages/store/staff.less b/wechat_jiaxuan/pages/store/staff.less
index b497d5d..8eb931e 100644
--- a/wechat_jiaxuan/pages/store/staff.less
+++ b/wechat_jiaxuan/pages/store/staff.less
@@ -7,6 +7,9 @@
left: 0;
z-index: -1;
}
+page{
+ overflow-y: hidden;
+}
.app{
overflow-y: hidden;
}
diff --git a/wechat_jiaxuan/pages/store/staff.wxss b/wechat_jiaxuan/pages/store/staff.wxss
index 448a4fd..ac60b6c 100644
--- a/wechat_jiaxuan/pages/store/staff.wxss
+++ b/wechat_jiaxuan/pages/store/staff.wxss
@@ -7,11 +7,17 @@
left: 0;
z-index: -1;
}
+page {
+ overflow-y: hidden;
+}
+.app {
+ overflow-y: hidden;
+}
.container {
padding: 26rpx 40rpx;
}
.container .avatar {
- margin-top: 260rpx;
+ margin-top: 300rpx;
width: 140rpx;
height: 140rpx;
border-radius: 50%;
@@ -106,8 +112,8 @@
align-items: center;
}
.static .card .num .icon {
- padding-bottom: 6rpx;
- font-weight: 400;
+ position: relative;
+ bottom: 4rpx;
margin-left: 6rpx;
}
.guide .title {
diff --git a/wechat_jiaxuan/pages/store/store.less b/wechat_jiaxuan/pages/store/store.less
index 57899f3..9e7f2ac 100644
--- a/wechat_jiaxuan/pages/store/store.less
+++ b/wechat_jiaxuan/pages/store/store.less
@@ -31,11 +31,13 @@
}
}
}
-
+page{
+ background-color: #F7F7F7;
+}
.main_content {
padding: 40rpx;
min-height: calc(100vh - 100rpx);
- background-color: #F7F7F7;
+
.app_title {
font-weight: 600;
font-size: 36rpx;
diff --git a/wechat_jiaxuan/pages/store/store.wxss b/wechat_jiaxuan/pages/store/store.wxss
index d154814..9b5b162 100644
--- a/wechat_jiaxuan/pages/store/store.wxss
+++ b/wechat_jiaxuan/pages/store/store.wxss
@@ -28,10 +28,12 @@
width: 28rpx;
margin-right: 10rpx;
}
+page {
+ background-color: #F7F7F7;
+}
.main_content {
padding: 40rpx;
min-height: calc(100vh - 100rpx);
- background-color: #F7F7F7;
}
.main_content .app_title {
font-weight: 600;
diff --git a/wechat_jiaxuan/pages/userinfo/collect.less b/wechat_jiaxuan/pages/userinfo/collect.less
index b638257..0ae7171 100644
--- a/wechat_jiaxuan/pages/userinfo/collect.less
+++ b/wechat_jiaxuan/pages/userinfo/collect.less
@@ -60,6 +60,9 @@
}
.name{
margin: 26rpx 0 14rpx;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
}
.info{
display: flex;
diff --git a/wechat_jiaxuan/pages/userinfo/collect.wxss b/wechat_jiaxuan/pages/userinfo/collect.wxss
index b9cbe65..fffb0ac 100644
--- a/wechat_jiaxuan/pages/userinfo/collect.wxss
+++ b/wechat_jiaxuan/pages/userinfo/collect.wxss
@@ -61,6 +61,9 @@
}
.list .item .name {
margin: 26rpx 0 14rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.list .item .info {
display: flex;
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.less b/wechat_jiaxuan/pages/userinfo/favorite.less
index 83a2add..808af58 100644
--- a/wechat_jiaxuan/pages/userinfo/favorite.less
+++ b/wechat_jiaxuan/pages/userinfo/favorite.less
@@ -60,6 +60,9 @@
}
.name{
margin: 26rpx 0 14rpx;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
}
.info{
display: flex;
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.wxss b/wechat_jiaxuan/pages/userinfo/favorite.wxss
index 12d27a3..1c47217 100644
--- a/wechat_jiaxuan/pages/userinfo/favorite.wxss
+++ b/wechat_jiaxuan/pages/userinfo/favorite.wxss
@@ -62,6 +62,9 @@
}
.list .item .name {
margin: 26rpx 0 14rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.list .item .info {
display: flex;
diff --git a/wechat_jiaxuan/pages/userinfo/index.less b/wechat_jiaxuan/pages/userinfo/index.less
index ab0032c..55d7a17 100644
--- a/wechat_jiaxuan/pages/userinfo/index.less
+++ b/wechat_jiaxuan/pages/userinfo/index.less
@@ -46,8 +46,14 @@
color: #111111;
border-bottom: 1rpx solid #e5e5e5;
display: flex;
+ align-items: center;
+ padding-bottom: 10rpx;
justify-content: space-between;
+ .field{
+ flex: 1;
+ }
.btn{
+ width: 120rpx;
font-size: 30rpx;
color: #B08771;
}
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxml b/wechat_jiaxuan/pages/userinfo/index.wxml
index 7c4e1ce..131b53f 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxml
+++ b/wechat_jiaxuan/pages/userinfo/index.wxml
@@ -15,7 +15,7 @@
<view class="line">
<view class="label">鐢佃瘽</view>
<view class="wechat_phone">
- <van-field type="number" border="{{ false }}" model:value="{{ phone }}" maxlength="{{ 11 }}" clearable />
+ <van-field class="field" type="number" border="{{ false }}" model:value="{{ phone }}" maxlength="{{ 11 }}" clearable />
<button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" class="btn">寰俊鎺堟潈</button>
</view>
</view>
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxss b/wechat_jiaxuan/pages/userinfo/index.wxss
index 51bb340..276fb28 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxss
+++ b/wechat_jiaxuan/pages/userinfo/index.wxss
@@ -48,9 +48,15 @@
color: #111111;
border-bottom: 1rpx solid #e5e5e5;
display: flex;
+ align-items: center;
+ padding-bottom: 10rpx;
justify-content: space-between;
}
+.list .line .wechat_phone .field {
+ flex: 1;
+}
.list .line .wechat_phone .btn {
+ width: 120rpx;
font-size: 30rpx;
color: #B08771;
}
diff --git a/wechat_jiaxuan/pages/userinfo/mysub.less b/wechat_jiaxuan/pages/userinfo/mysub.less
index a3c8c93..f452423 100644
--- a/wechat_jiaxuan/pages/userinfo/mysub.less
+++ b/wechat_jiaxuan/pages/userinfo/mysub.less
@@ -49,6 +49,9 @@
font-weight: 500;
font-size: 32rpx;
margin-right: 18rpx;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
}
}
.line{
diff --git a/wechat_jiaxuan/pages/userinfo/mysub.wxss b/wechat_jiaxuan/pages/userinfo/mysub.wxss
index d1fa552..7e4ceeb 100644
--- a/wechat_jiaxuan/pages/userinfo/mysub.wxss
+++ b/wechat_jiaxuan/pages/userinfo/mysub.wxss
@@ -52,6 +52,9 @@
font-weight: 500;
font-size: 32rpx;
margin-right: 18rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.list .item .line {
display: flex;
diff --git a/wechat_jiaxuan/project.private.config.json b/wechat_jiaxuan/project.private.config.json
index 6d3511e..f2725a3 100644
--- a/wechat_jiaxuan/project.private.config.json
+++ b/wechat_jiaxuan/project.private.config.json
@@ -53,7 +53,7 @@
},
{
"name": "",
- "pathName": "pages/productVideo/index",
+ "pathName": "pages/auth/auth",
"query": "",
"launchMode": "default",
"scene": null
diff --git a/wechat_staff/components/disCase/index.js b/wechat_staff/components/disCase/index.js
index 04a3324..5ae4532 100644
--- a/wechat_staff/components/disCase/index.js
+++ b/wechat_staff/components/disCase/index.js
@@ -24,6 +24,7 @@
},
attached() {
this.getCatelist()
+ this.getList()
},
methods: {
getCatelist(){
@@ -35,9 +36,6 @@
this.setData({
cateList: res.data
})
- setTimeout(() => {
- this.getList()
- }, 300)
}
})
},
@@ -45,7 +43,6 @@
if(this.data.isLoading){
return
}
-
this.setData({isLoading:true})
const { sortType, query, tagCodes, pageNum, pageSize,catalogCode } = this.data
getZhongTaiWholecasePage({
diff --git a/wechat_staff/components/videoPlay/index.wxml b/wechat_staff/components/videoPlay/index.wxml
index 75e31f2..53e118b 100644
--- a/wechat_staff/components/videoPlay/index.wxml
+++ b/wechat_staff/components/videoPlay/index.wxml
@@ -1,5 +1,5 @@
<view wx:if="{{ isVShow }}" bind:tap="onClose" class="video_content">
<view class="video">
- <video id="myVideo" src="{{videoSrc}}" autoplay show-fullscreen-btn show-play-btn ></video>
+ <video id="myVideo" src="{{videoSrc}}" autoplay show-play-btn ></video>
</view>
</view >
\ No newline at end of file
diff --git a/wechat_staff/pages/consult/detail.less b/wechat_staff/pages/consult/detail.less
index 8412c50..5b27da2 100644
--- a/wechat_staff/pages/consult/detail.less
+++ b/wechat_staff/pages/consult/detail.less
@@ -43,7 +43,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
border-radius: 8rpx;
.sheji{
width: 28rpx;
diff --git a/wechat_staff/pages/consult/detail.wxss b/wechat_staff/pages/consult/detail.wxss
index 026f58f..5698025 100644
--- a/wechat_staff/pages/consult/detail.wxss
+++ b/wechat_staff/pages/consult/detail.wxss
@@ -41,7 +41,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
border-radius: 8rpx;
}
.footer .sub_btn .sheji {
diff --git a/wechat_staff/pages/detailDis/case.less b/wechat_staff/pages/detailDis/case.less
index 095aea7..c79c556 100644
--- a/wechat_staff/pages/detailDis/case.less
+++ b/wechat_staff/pages/detailDis/case.less
@@ -124,7 +124,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
border-radius: 8rpx;
.sheji{
width: 28rpx;
diff --git a/wechat_staff/pages/detailDis/case.wxss b/wechat_staff/pages/detailDis/case.wxss
index f5c86e0..ac802cd 100644
--- a/wechat_staff/pages/detailDis/case.wxss
+++ b/wechat_staff/pages/detailDis/case.wxss
@@ -112,7 +112,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
border-radius: 8rpx;
}
.footer .sub_btn .sheji {
diff --git a/wechat_staff/pages/detailDis/product.less b/wechat_staff/pages/detailDis/product.less
index d1870da..c11c512 100644
--- a/wechat_staff/pages/detailDis/product.less
+++ b/wechat_staff/pages/detailDis/product.less
@@ -71,6 +71,8 @@
}
.main_content {
+ position: relative;
+ bottom: 14rpx;
padding: 52rpx 40rpx 40rpx;
border-radius: 16rpx 16rpx 0rpx 0rpx;
background-color: #fff;
@@ -260,7 +262,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
border-radius: 8rpx;
.sheji{
width: 28rpx;
diff --git a/wechat_staff/pages/detailDis/product.wxss b/wechat_staff/pages/detailDis/product.wxss
index 497791a..8a26c9c 100644
--- a/wechat_staff/pages/detailDis/product.wxss
+++ b/wechat_staff/pages/detailDis/product.wxss
@@ -63,6 +63,8 @@
width: 100%;
}
.main_content {
+ position: relative;
+ bottom: 14rpx;
padding: 52rpx 40rpx 40rpx;
border-radius: 16rpx 16rpx 0rpx 0rpx;
background-color: #fff;
@@ -236,7 +238,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
border-radius: 8rpx;
}
.footer .sub_btn .sheji {
diff --git a/wechat_staff/pages/detailDis/realpic.less b/wechat_staff/pages/detailDis/realpic.less
index d7cc0e4..98ff765 100644
--- a/wechat_staff/pages/detailDis/realpic.less
+++ b/wechat_staff/pages/detailDis/realpic.less
@@ -2,6 +2,7 @@
padding: 0 40rpx 220rpx;
.info_item{
width: 100%;
+ margin-bottom: 20rpx;
}
.main_title {
font-weight: 500;
@@ -61,7 +62,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
border-radius: 8rpx;
.sheji{
width: 28rpx;
diff --git a/wechat_staff/pages/detailDis/realpic.wxss b/wechat_staff/pages/detailDis/realpic.wxss
index 78a2737..a4a8534 100644
--- a/wechat_staff/pages/detailDis/realpic.wxss
+++ b/wechat_staff/pages/detailDis/realpic.wxss
@@ -3,6 +3,7 @@
}
.container .info_item {
width: 100%;
+ margin-bottom: 20rpx;
}
.container .main_title {
font-weight: 500;
@@ -57,7 +58,6 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
border-radius: 8rpx;
}
.footer .sub_btn .sheji {
diff --git a/wechat_staff/pages/sets/index.js b/wechat_staff/pages/sets/index.js
index 1da5c40..5775c82 100644
--- a/wechat_staff/pages/sets/index.js
+++ b/wechat_staff/pages/sets/index.js
@@ -25,11 +25,14 @@
success(res) {
if (res.confirm) {
logout({}).then(res => {
- wx.setStorageSync('member', null)
- wx.setStorageSync('token', '')
- wx.navigateTo({
- url: '/pages/login/index',
- })
+ const sessionKey = wx.getStorageSync('sessionKey')
+ wx.clearStorageSync()
+ setTimeout(() => {
+ wx.setStorageSync('sessionKey', sessionKey)
+ wx.navigateTo({
+ url: '/pages/login/index',
+ })
+ }, 300)
})
}
}
diff --git a/wechat_staff/pages/store/staff.less b/wechat_staff/pages/store/staff.less
index 65a4393..e0c3bd7 100644
--- a/wechat_staff/pages/store/staff.less
+++ b/wechat_staff/pages/store/staff.less
@@ -7,12 +7,13 @@
left: 0;
z-index: -1;
}
-.app{
+page{
overflow-y: hidden;
}
.container {
padding: 26rpx 40rpx;
+ overflow-y: hidden;
.avatar {
margin-top: 300rpx;
width: 140rpx;
diff --git a/wechat_staff/pages/store/staff.wxss b/wechat_staff/pages/store/staff.wxss
index dc40b81..8a0672b 100644
--- a/wechat_staff/pages/store/staff.wxss
+++ b/wechat_staff/pages/store/staff.wxss
@@ -7,11 +7,12 @@
left: 0;
z-index: -1;
}
-.app {
+page {
overflow-y: hidden;
}
.container {
padding: 26rpx 40rpx;
+ overflow-y: hidden;
}
.container .avatar {
margin-top: 300rpx;
diff --git a/wechat_staff/pages/userinfo/collect.js b/wechat_staff/pages/userinfo/collect.js
index 76e8ca9..cde2e78 100644
--- a/wechat_staff/pages/userinfo/collect.js
+++ b/wechat_staff/pages/userinfo/collect.js
@@ -14,20 +14,29 @@
pageNum: 1,
pageSize: 10,
},
- onLoad(options) {
- },
+ onLoad(options) {},
onPullDownRefresh: function () {
console.log('涓嬫媺鍒锋柊');
- this.setData({ dataList: [], pageNum: 1, total: 0 })
+ this.setData({
+ dataList: [],
+ pageNum: 1,
+ total: 0
+ })
this.getList()
},
onReachBottom() {
console.log('瑙﹀簳浜嬩欢');
- const { total, dataList, pageNum } = this.data
- if(total > dataList.length){
- this.setData({ pageNum: pageNum + 1 })
+ const {
+ total,
+ dataList,
+ pageNum
+ } = this.data
+ if (total > dataList.length) {
+ this.setData({
+ pageNum: pageNum + 1
+ })
this.getList()
- }else{
+ } else {
wx.showToast({
title: '鏆傛棤鏇村鏁版嵁',
icon: 'none'
@@ -38,20 +47,24 @@
const activeTabs = e.currentTarget.dataset.val
this.setData({
activeTabs,
- dataList: [],total: 0,pageNum: 1
+ dataList: [],
+ total: 0,
+ pageNum: 1
})
this.getList()
},
handleDetail(e) {
const id = e.currentTarget.dataset.id
- const { activeTabs } = this.data
+ const {
+ activeTabs
+ } = this.data
let url = ''
- if(activeTabs == 'product_intro'){
- url = '/pages/detailDis/product'
- }else if(activeTabs == 'whole_case'){
- url = '/pages/detailDis/case'
- }else{
- url = '/pages/detailDis/realpic'
+ if (activeTabs == 'product_intro') {
+ url = '/pages/detailDis/product'
+ } else if (activeTabs == 'whole_case') {
+ url = '/pages/detailDis/case'
+ } else {
+ url = '/pages/detailDis/realpic'
}
wx.navigateTo({
url: `${url}?id=${id}`,
@@ -70,16 +83,16 @@
pageNum
}).then(res => {
if (res.data) {
- res.data.pageNum = res.data.pageNum <=0?1: res.data.pageNum
- if(pageNum == res.data.pageNum){
- if(pageNum == 1){
- this.setData({dataList:[],total:0})
- }
- this.setData({
- dataList: [...this.data.dataList, ...res.data.records || []],
- total: res.data.total
- })
- }
+ // res.data.pageNum = res.data.pageNum <=0?1: res.data.pageNum
+ // if(pageNum == res.data.pageNum){
+ // if(pageNum == 1){
+ // this.setData({dataList:[],total:0})
+ // }
+ this.setData({
+ dataList: [...this.data.dataList, ...res.data.records || []],
+ total: res.data.total
+ })
+ // }
}
})
},
@@ -94,8 +107,10 @@
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
- onShow() {
- this.setData({pageNum:1})
+ onShow() {
+ this.setData({
+ pageNum: 1
+ })
this.getList()
},
diff --git a/wechat_staff/pages/userinfo/collect.less b/wechat_staff/pages/userinfo/collect.less
index f2d4f55..58ff9c9 100644
--- a/wechat_staff/pages/userinfo/collect.less
+++ b/wechat_staff/pages/userinfo/collect.less
@@ -60,6 +60,9 @@
}
.name{
margin: 26rpx 0 14rpx;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
}
.info{
display: flex;
diff --git a/wechat_staff/pages/userinfo/collect.wxss b/wechat_staff/pages/userinfo/collect.wxss
index 8799200..aca7e7e 100644
--- a/wechat_staff/pages/userinfo/collect.wxss
+++ b/wechat_staff/pages/userinfo/collect.wxss
@@ -61,6 +61,9 @@
}
.list .item .name {
margin: 26rpx 0 14rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.list .item .info {
display: flex;
diff --git a/wechat_staff/pages/userinfo/index.wxml b/wechat_staff/pages/userinfo/index.wxml
index 5c83bc9..ca20de9 100644
--- a/wechat_staff/pages/userinfo/index.wxml
+++ b/wechat_staff/pages/userinfo/index.wxml
@@ -1,5 +1,5 @@
<view class="container">
- <image class="avatar" src="{{ userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png' }}" mode="widthFix"></image>
+ <image class="avatar" src="{{ userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png' }}"></image>
<!-- <button open-type="chooseAvatar" bindchooseavatar="getBindchooseavatar" class="avatar_btn">鏇存崲澶村儚</button> -->
<button bind:tap="selMedia3" class="avatar_btn">鏇存崲澶村儚</button>
<view class="list">
--
Gitblit v1.9.3