From 918bbf3afade9011ca666ba0680e3f79039a0ce7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 七月 2024 13:57:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/detailDis/product.js | 12 +++--
wechat_jiaxuan/project.private.config.json | 2
wechat_staff/utils/config.js | 4 +-
wechat_staff/pages/login/index.less | 6 ++-
wechat_staff/pages/login/index.wxss | 6 ++-
wechat_staff/pages/index/index.wxss | 30 +++++++++++---
wechat_jiaxuan/utils/config.js | 4 +-
wechat_jiaxuan/app.json | 3 +
wechat_jiaxuan/pages/index/index.js | 4 +-
9 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/wechat_jiaxuan/app.json b/wechat_jiaxuan/app.json
index d2f1198..0538ed9 100644
--- a/wechat_jiaxuan/app.json
+++ b/wechat_jiaxuan/app.json
@@ -80,6 +80,9 @@
"scope.userLocation": {
"desc": "浣犵殑浣嶇疆淇℃伅灏嗙敤浜庡皬绋嬪簭浣嶇疆鎺ュ彛鐨勬晥鏋滃睍绀�"
},
+ "scope.writePhotosAlbum":{
+ "desc": "鎺堟潈鐩稿唽鏉冮檺鍚庯紝鎮ㄦ墠鑳芥甯镐繚瀛樺浘鐗�"
+ },
"scope.userInfo": {
"desc": "浣犵殑寰俊鍛㈢О灏嗙敤浜庡皬绋嬪簭鍛㈢О鐨勬晥鏋滃睍绀�"
}
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index ba7ac8f..16e0b4c 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -25,6 +25,11 @@
actionType: 'view',
id: options.id
})
+ getMemberInfo().then(res => {
+ this.setData({
+ member: res.data
+ })
+ })
},
onLoad(options) {
var app = getApp().globalData
@@ -34,10 +39,8 @@
if (options.origin && options.origin == 'b') {
this.setData({ origin: 'b' })
}
- const member = wx.getStorageSync('member')
this.setData({
- id: options.id,
- member
+ id: options.id
})
},
bindchange(e) {
@@ -66,9 +69,8 @@
handleAction(e) {
const actionType = e.currentTarget.dataset.code
const {
- info
+ info, member
} = this.data
- const member = wx.getStorageSync('member')
if (member.authStatus == '0') {
return wx.navigateTo({
url: '/pages/auth/auth',
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index 927da79..d63bb12 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -56,8 +56,8 @@
},
onShow() {
let that = this
- const member = wx.getStorageSync('member')
- if (member && (member.authStatus == '1' || member.authStatus == '2')) {
+ const member = wx.getStorageSync('member') || {}
+ if (member && member.id) {
getMemberInfo().then(res => {
this.setData({
member: res.data
diff --git a/wechat_jiaxuan/project.private.config.json b/wechat_jiaxuan/project.private.config.json
index 0503390..6d3511e 100644
--- a/wechat_jiaxuan/project.private.config.json
+++ b/wechat_jiaxuan/project.private.config.json
@@ -5,7 +5,7 @@
"urlCheck": false
},
"description": "椤圭洰绉佹湁閰嶇疆鏂囦欢銆傛鏂囦欢涓殑鍐呭灏嗚鐩� project.config.json 涓殑鐩稿悓瀛楁銆傞」鐩殑鏀瑰姩浼樺厛鍚屾鍒版鏂囦欢涓�傝瑙佹枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
- "libVersion": "3.5.0",
+ "libVersion": "3.4.10",
"condition": {
"miniprogram": {
"list": [
diff --git a/wechat_jiaxuan/utils/config.js b/wechat_jiaxuan/utils/config.js
index 23fa1e2..1448239 100644
--- a/wechat_jiaxuan/utils/config.js
+++ b/wechat_jiaxuan/utils/config.js
@@ -1,8 +1,8 @@
-export const baseUrl = 'http://192.168.0.135:10027' // 鏈湴
-// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' //娴嬭瘯鏈嶅姟鍣�
+// export const baseUrl = 'http://192.168.0.135:10027' // 鏈湴
+export const baseUrl = 'https://dmtest.ahapp.net/web_interface' //娴嬭瘯鏈嶅姟鍣�
// export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'
diff --git a/wechat_staff/pages/index/index.wxss b/wechat_staff/pages/index/index.wxss
index 2311601..4b1d745 100644
--- a/wechat_staff/pages/index/index.wxss
+++ b/wechat_staff/pages/index/index.wxss
@@ -1,9 +1,9 @@
-.search_fix{
- position: fixed;
- z-index: 10000;
- width: 100%;
- height: 206rpx;
- background-color: white;
+.search_fix {
+ position: fixed;
+ z-index: 10000;
+ width: 100%;
+ height: 206rpx;
+ background-color: white;
}
.search_wrap {
display: flex;
@@ -88,7 +88,7 @@
.func_lsit {
display: flex;
justify-content: space-between;
- padding: 60rpx;
+ padding: 20rpx 60rpx;
}
.func_lsit .item {
width: 120rpx;
@@ -238,3 +238,19 @@
.home_ar {
width: 44rpx;
}
+.wx-swiper-dots.wx-swiper-dots-horizontal {
+ position: absolute;
+ right: 0;
+ bottom: 0rpx;
+}
+/* 鎸囩ず鐐圭殑鏍峰紡 */
+.wx-swiper-dots .wx-swiper-dot {
+ width: 60rpx;
+ height: 4rpx;
+ background: #f4f4f4;
+ margin-left: -15rpx;
+ border-radius: 5rpx;
+}
+.wx-swiper-dot.wx-swiper-dot-active {
+ background: #666666;
+}
diff --git a/wechat_staff/pages/login/index.less b/wechat_staff/pages/login/index.less
index b5818dc..bd82b41 100644
--- a/wechat_staff/pages/login/index.less
+++ b/wechat_staff/pages/login/index.less
@@ -65,7 +65,7 @@
padding: 40rpx;
position: relative;
.content{
- height: calc( 100vh - 460rpx );
+ height: calc( 100% - 180rpx );
overflow: auto;
margin-bottom: 20rpx;
}
@@ -74,6 +74,7 @@
padding: 20rpx 0rpx;
width: 100%;
z-index: 999;
+ bottom: 12rpx;
border-top: 1px solid #e5e5e5;
.reject{
width: 670rpx;
@@ -82,10 +83,11 @@
color: #999999;
text-align: center;
margin-top: 30rpx;
+ height: 60rpx;
}
.agree{
width: 670rpx;
- height: 88rpx;
+ height: 90rpx;
background: #B08771;
border-radius: 8rpx;
display: flex;
diff --git a/wechat_staff/pages/login/index.wxss b/wechat_staff/pages/login/index.wxss
index cd3c013..a02546a 100644
--- a/wechat_staff/pages/login/index.wxss
+++ b/wechat_staff/pages/login/index.wxss
@@ -66,7 +66,7 @@
position: relative;
}
.modal .content {
- height: calc(100vh - 460rpx);
+ height: calc(100% - 180rpx);
overflow: auto;
margin-bottom: 20rpx;
}
@@ -75,6 +75,7 @@
padding: 20rpx 0rpx;
width: 100%;
z-index: 999;
+ bottom: 12rpx;
border-top: 1px solid #e5e5e5;
}
.modal .btns .reject {
@@ -84,10 +85,11 @@
color: #999999;
text-align: center;
margin-top: 30rpx;
+ height: 60rpx;
}
.modal .btns .agree {
width: 670rpx;
- height: 88rpx;
+ height: 90rpx;
background: #B08771;
border-radius: 8rpx;
display: flex;
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index a150c8d..e672602 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,5 +1,5 @@
-export const baseUrl = 'http://192.168.0.135:10027'
-// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // 鏈湴
+// export const baseUrl = 'http://192.168.0.135:10027'
+export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // 鏈湴
// export const baseUrl = 'http://zbtest.ahapp.net/zbom_interface/jx/wechat/' //娴嬭瘯鏈嶅姟鍣�
// export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'
--
Gitblit v1.9.3