From 7a2084c90ed29a4ec9d4267deb2b78f0d49c904d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 23 七月 2024 09:56:34 +0800
Subject: [PATCH] ‘’
---
wechat_staff/pages/login/index.wxml | 7
wechat_jiaxuan/components/disProduct/index.js | 5
wechat_jiaxuan/pages/sets/index.wxml | 2
wechat_jiaxuan/components/disProduct/index.less | 7
wechat_jiaxuan/components/disRealpic/index.less | 3
wechat_jiaxuan/static/tabbar/nav_mendianAc.png | 0
wechat_jiaxuan/app.js | 55 ++--
wechat_jiaxuan/app.wxss | 1
wechat_jiaxuan/pages/detailDis/product.wxml | 2
wechat_jiaxuan/pages/detailDis/realpic.wxml | 2
wechat_jiaxuan/components/authCard/authCard.less | 2
wechat_jiaxuan/pages/auth/auth.less | 5
wechat_jiaxuan/pages/auth/auth.wxml | 4
wechat_jiaxuan/pages/design/design.less | 5
wechat_jiaxuan/pages/auth/auth.wxss | 5
wechat_jiaxuan/pages/design/design.wxml | 2
wechat_jiaxuan/pages/design/design.wxss | 5
wechat_jiaxuan/pages/detailDis/realpic.wxss | 4
wechat_staff/pages/login/index.js | 141 +++++++++--
wechat_jiaxuan/pages/index/index.js | 200 ++++++++++++----
wechat_jiaxuan/pages/auth/auth.json | 3
wechat_staff/app.js | 75 ++---
wechat_staff/utils/config.js | 4
wechat_jiaxuan/components/disCase/index.js | 1
wechat_staff/pages/login/index.less | 5
wechat_jiaxuan/components/disCase/index.wxml | 2
wechat_jiaxuan/pages/index/index.less | 12
wechat_jiaxuan/components/disCase/index.wxss | 2
wechat_jiaxuan/components/authCard/authCard.wxss | 2
wechat_jiaxuan/pages/design/design.js | 19 +
wechat_jiaxuan/pages/detailDis/realpic.less | 5
wechat_jiaxuan/components/disRealpic/index.js | 1
wechat_jiaxuan/project.private.config.json | 2
wechat_staff/pages/login/index.json | 3
wechat_jiaxuan/components/disCase/index.less | 2
wechat_jiaxuan/components/disRealpic/index.wxml | 2
wechat_jiaxuan/pages/index/index.wxml | 18
wechat_jiaxuan/pages/sets/index.js | 5
wechat_jiaxuan/components/disRealpic/index.wxss | 2
wechat_jiaxuan/pages/index/index.wxss | 11
wechat_jiaxuan/utils/request.js | 35 --
wechat_staff/api/index.js | 9
wechat_jiaxuan/components/disProduct/index.wxss | 5
wechat_jiaxuan/components/disProduct/index.wxml | 2
44 files changed, 452 insertions(+), 232 deletions(-)
diff --git a/wechat_jiaxuan/app.js b/wechat_jiaxuan/app.js
index c9e2dcb..17d1f15 100644
--- a/wechat_jiaxuan/app.js
+++ b/wechat_jiaxuan/app.js
@@ -14,32 +14,37 @@
}
// 鎺堟潈鐧诲綍
const member = wx.getStorageSync('member')
- wx.login({
- timeout: 5000,
- success(res) {
- if (res.code) {
- //鍙戣捣缃戠粶璇锋眰
- wxLoginCustomer({
- code: res.code
- }).then(res => {
- console.log(res)
- if (res && res.data.member) {
- wx.setStorageSync('member', res.data.member)
- wx.setStorageSync('openid', res.data.member.openid)
- wx.setStorageSync('sessionKey', res.data.sessionKey)
- wx.setStorageSync('token', res.data.token)
- } else {
- console.log('鐧诲綍澶辫触锛�')
- }
- })
- } else {
- console.log('鐧诲綍澶辫触锛�' + res)
+ if (member && member.token) {
+
+ } else {
+ wx.login({
+ timeout: 5000,
+ success(res) {
+ if (res.code) {
+ //鍙戣捣缃戠粶璇锋眰
+ wxLoginCustomer({
+ code: res.code
+ }).then(res => {
+ console.log(res)
+ if (res && res.data.member) {
+ wx.setStorageSync('member', res.data.member)
+ wx.setStorageSync('openid', res.data.member.openid)
+ wx.setStorageSync('sessionKey', res.data.sessionKey)
+ wx.setStorageSync('token', res.data.token)
+ } else {
+ console.log('鐧诲綍澶辫触锛�')
+ }
+ })
+ } else {
+ console.log('鐧诲綍澶辫触锛�' + res)
+ }
+ },
+ fail(err) {
+ console.log(err)
}
- },
- fail(err) {
- console.log(err)
- }
- })
+ })
+ }
+
}
diff --git a/wechat_jiaxuan/app.wxss b/wechat_jiaxuan/app.wxss
index cb2e460..5e9a5f0 100644
--- a/wechat_jiaxuan/app.wxss
+++ b/wechat_jiaxuan/app.wxss
@@ -9,6 +9,7 @@
}
image{
display: flex;
+ border-radius: 8rpx;
}
.container {
min-height: 100vh;
diff --git a/wechat_jiaxuan/components/authCard/authCard.less b/wechat_jiaxuan/components/authCard/authCard.less
index dfadc94..7e5f7c9 100644
--- a/wechat_jiaxuan/components/authCard/authCard.less
+++ b/wechat_jiaxuan/components/authCard/authCard.less
@@ -30,7 +30,7 @@
font-weight: 600;
font-size: 32rpx;
color: #111111;
- margin-bottom: 2rpx;
+ margin-bottom: 6rpx;
}
.desc{
font-weight: 300;
diff --git a/wechat_jiaxuan/components/authCard/authCard.wxss b/wechat_jiaxuan/components/authCard/authCard.wxss
index c03535e..94cc6a7 100644
--- a/wechat_jiaxuan/components/authCard/authCard.wxss
+++ b/wechat_jiaxuan/components/authCard/authCard.wxss
@@ -32,7 +32,7 @@
font-weight: 600;
font-size: 32rpx;
color: #111111;
- margin-bottom: 2rpx;
+ margin-bottom: 6rpx;
}
.wrap1 .content .desc {
font-weight: 300;
diff --git a/wechat_jiaxuan/components/disCase/index.js b/wechat_jiaxuan/components/disCase/index.js
index 4c40367..96fca1a 100644
--- a/wechat_jiaxuan/components/disCase/index.js
+++ b/wechat_jiaxuan/components/disCase/index.js
@@ -126,6 +126,7 @@
this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
},
bindblur() {
+ this.setData({ pageNum: 1,dataList: [],total: 0})
this.getList()
},
subParam() {
diff --git a/wechat_jiaxuan/components/disCase/index.less b/wechat_jiaxuan/components/disCase/index.less
index 340929d..0ae4378 100644
--- a/wechat_jiaxuan/components/disCase/index.less
+++ b/wechat_jiaxuan/components/disCase/index.less
@@ -58,6 +58,8 @@
width: 100%;
display: flex;
flex-wrap: wrap;
+ max-height: 400rpx;
+ overflow: auto;
padding: 30rpx 40rpx;
.item {
width: 202rpx;
diff --git a/wechat_jiaxuan/components/disCase/index.wxml b/wechat_jiaxuan/components/disCase/index.wxml
index b9e38d3..e7166d1 100644
--- a/wechat_jiaxuan/components/disCase/index.wxml
+++ b/wechat_jiaxuan/components/disCase/index.wxml
@@ -2,7 +2,7 @@
<view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
- <input bindblur="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储妗堜緥鍚嶇О" />
+ <input bindconfirm="bindblur" bindblur="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储妗堜緥鍚嶇О" />
</view>
</view>
<!-- -->
diff --git a/wechat_jiaxuan/components/disCase/index.wxss b/wechat_jiaxuan/components/disCase/index.wxss
index 5284738..0f3f5ed 100644
--- a/wechat_jiaxuan/components/disCase/index.wxss
+++ b/wechat_jiaxuan/components/disCase/index.wxss
@@ -59,6 +59,8 @@
width: 100%;
display: flex;
flex-wrap: wrap;
+ max-height: 400rpx;
+ overflow: auto;
padding: 30rpx 40rpx;
}
.main_content .query_param .list .item {
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index 88d9997..abd00dd 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -61,10 +61,13 @@
}).then(res => {
this.setData({
secondCateList: res.data || [],
+ activeParam: []
})
})
},
bindblur() {
+ console.log('澶卞幓鐒︾偣');
+ this.setData({ pageNum: 1,datalist: [],total: 0})
this.getList()
},
getList() {
@@ -160,7 +163,7 @@
item.paramIndex = -1
item.paramName = ''
})
- this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
+ this.setData({ tagCodes: [],activeParam: [],secondCateList,activeIndex: -1 })
},
subParam() {
this.setData({ activeParam: [] })
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index f64afe7..5243721 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -67,14 +67,14 @@
height: 100%;
.query_wrap {
display: flex;
+ width: 100%;
.item {
+ width: 50%;
height: 100rpx;
display: flex;
align-items: center;
justify-content: center;
color: #666666;
- flex: 1;
-
.name {
margin-right: 12rpx;
}
@@ -91,7 +91,8 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
-
+ max-height: 400rpx;
+ overflow: auto;
.item {
width: 154rpx;
height: 72rpx;
diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index 9ca1a53..d0248d6 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -2,7 +2,7 @@
<view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
- <input bindblur="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储浜у搧鍚嶇О" />
+ <input bindconfirm="bindblur" bindblur="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储浜у搧鍚嶇О" />
</view>
</view>
<view class="home_content" style="padding-top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px;">
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index 01a09dd..498d832 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -60,14 +60,15 @@
}
.main_content .main_right .query_wrap {
display: flex;
+ width: 100%;
}
.main_content .main_right .query_wrap .item {
+ width: 50%;
height: 100rpx;
display: flex;
align-items: center;
justify-content: center;
color: #666666;
- flex: 1;
}
.main_content .main_right .query_wrap .item .name {
margin-right: 12rpx;
@@ -82,6 +83,8 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
+ max-height: 400rpx;
+ overflow: auto;
}
.main_content .main_right .query_form .list .item {
width: 154rpx;
diff --git a/wechat_jiaxuan/components/disRealpic/index.js b/wechat_jiaxuan/components/disRealpic/index.js
index bf22744..034a81c 100644
--- a/wechat_jiaxuan/components/disRealpic/index.js
+++ b/wechat_jiaxuan/components/disRealpic/index.js
@@ -152,6 +152,7 @@
this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
},
bindblur() {
+ this.setData({ pageNum: 1,dataList: [],total: 0})
this.getList()
},
subParam() {
diff --git a/wechat_jiaxuan/components/disRealpic/index.less b/wechat_jiaxuan/components/disRealpic/index.less
index a168121..30a32f5 100644
--- a/wechat_jiaxuan/components/disRealpic/index.less
+++ b/wechat_jiaxuan/components/disRealpic/index.less
@@ -66,7 +66,8 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
-
+ max-height: 400rpx;
+ overflow: auto;
.item {
width: 202rpx;
height: 72rpx;
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxml b/wechat_jiaxuan/components/disRealpic/index.wxml
index 98ef3e0..a943534 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxml
+++ b/wechat_jiaxuan/components/disRealpic/index.wxml
@@ -2,7 +2,7 @@
<view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
- <input bindblur="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储瀹炴櫙鍚嶇О" />
+ <input bindconfirm="bindblur" bindblur="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储瀹炴櫙鍚嶇О" />
</view>
</view>
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxss b/wechat_jiaxuan/components/disRealpic/index.wxss
index 613db32..e0425c2 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxss
+++ b/wechat_jiaxuan/components/disRealpic/index.wxss
@@ -60,6 +60,8 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
+ max-height: 400rpx;
+ overflow: auto;
}
.main_content .query_param .list .item {
width: 202rpx;
diff --git a/wechat_jiaxuan/pages/auth/auth.json b/wechat_jiaxuan/pages/auth/auth.json
index 122b9f1..cdba5aa 100644
--- a/wechat_jiaxuan/pages/auth/auth.json
+++ b/wechat_jiaxuan/pages/auth/auth.json
@@ -2,7 +2,8 @@
"usingComponents": {
"van-nav-bar": "@vant/weapp/nav-bar/index",
"van-checkbox": "@vant/weapp/checkbox/index",
- "van-popup": "@vant/weapp/popup/index"
+ "van-popup": "@vant/weapp/popup/index",
+ "mp-html": "mp-html"
},
"navigationBarTitleText": "鎺堟潈鐧诲綍"
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/auth/auth.less b/wechat_jiaxuan/pages/auth/auth.less
index 836371e..b2da8d2 100644
--- a/wechat_jiaxuan/pages/auth/auth.less
+++ b/wechat_jiaxuan/pages/auth/auth.less
@@ -37,9 +37,10 @@
}
}
.modal{
- width: 600rpx;
+ width: 100%;
+ max-height: 1120rpx;
min-height: 600rpx;
- padding: 30rpx;
+ padding: 40rpx;
}
.title{
font-weight: 600;
diff --git a/wechat_jiaxuan/pages/auth/auth.wxml b/wechat_jiaxuan/pages/auth/auth.wxml
index 4ae6b5d..5d23db3 100644
--- a/wechat_jiaxuan/pages/auth/auth.wxml
+++ b/wechat_jiaxuan/pages/auth/auth.wxml
@@ -21,9 +21,9 @@
</view>
</view>
<!-- -->
- <van-popup show="{{ showModal }}" round bind:close="onClose">
+ <van-popup position="bottom" show="{{ showModal }}" round bind:close="onClose">
<view class="modal">
- <rich-text nodes="{{activeHtml}}"></rich-text>
+ <mp-html content="{{activeHtml}}"></mp-html>
</view>
</van-popup>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/auth/auth.wxss b/wechat_jiaxuan/pages/auth/auth.wxss
index 2806670..fb2824a 100644
--- a/wechat_jiaxuan/pages/auth/auth.wxss
+++ b/wechat_jiaxuan/pages/auth/auth.wxss
@@ -37,9 +37,10 @@
font-size: 30rpx;
}
.modal {
- width: 600rpx;
+ width: 100%;
+ max-height: 1120rpx;
min-height: 600rpx;
- padding: 30rpx;
+ padding: 40rpx;
}
.title {
font-weight: 600;
diff --git a/wechat_jiaxuan/pages/design/design.js b/wechat_jiaxuan/pages/design/design.js
index 4e61074..6c9fcf1 100644
--- a/wechat_jiaxuan/pages/design/design.js
+++ b/wechat_jiaxuan/pages/design/design.js
@@ -3,6 +3,8 @@
getArea,
saveFreeCustomizationApply
} from '../../api/index'
+var QQMapWX = require('../../utils/qqmap-wx-jssdk.min');
+var qqmapsdk;
Page({
/**
@@ -27,6 +29,23 @@
},
onLoad(options) {
this.initData()
+ qqmapsdk = new QQMapWX({
+ key: 'HIDBZ-2QXL4-TAWUD-XET6Q-EKTJE-CCBSQ'
+ });
+ qqmapsdk.reverseGeocoder({
+ success: (res) => {
+ console.log('res', res);
+ let addr = {
+ // provinceCode: codes[0] + '00',
+ provinceName: res.result.ad_info.province,
+ // cityCode: codes[1] + '00',
+ cityName: res.result.ad_info.city,
+ // areaCode: codes[2] + '00',
+ areaName: res.result.ad_info.district,
+ }
+ this.setData({ addr })
+ }
+ })
},
onSubmit() {
diff --git a/wechat_jiaxuan/pages/design/design.less b/wechat_jiaxuan/pages/design/design.less
index a4e63bc..575613d 100644
--- a/wechat_jiaxuan/pages/design/design.less
+++ b/wechat_jiaxuan/pages/design/design.less
@@ -1,12 +1,13 @@
.banner {
width: 100%;
- padding-bottom: 100rpx;
+ position: relative;
+ top: -100rpx;
}
.main_content {
width: 670rpx;
position: relative;
- top: -100rpx;
+ top: -120rpx;
margin: 0 auto;
background: #FFFFFF;
box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(0, 0, 0, 0.14);
diff --git a/wechat_jiaxuan/pages/design/design.wxml b/wechat_jiaxuan/pages/design/design.wxml
index d7700a6..6efe16a 100644
--- a/wechat_jiaxuan/pages/design/design.wxml
+++ b/wechat_jiaxuan/pages/design/design.wxml
@@ -8,7 +8,7 @@
</view>
<view class="line">
<image class="icon" src="../../static/icon/design_ic_phone.png" mode="widthFix"></image>
- <van-field type="number" class="input" custom-style="background-color: #F6F6F6;" model:value="{{ phone }}" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable maxlength="{{ 11 }}" />
+ <van-field type="number" class="input" custom-style="background-color: #F6F6F6;" model:value="{{ phone }}" placeholder="璇疯緭鍏ヨ仈绯荤數璇濓紝棰嗗厤璐规晥鏋滃浘" clearable maxlength="{{ 11 }}" />
</view>
<view class="line">
<image class="icon" src="../../static/icon/design_ic_city.png" mode="widthFix"></image>
diff --git a/wechat_jiaxuan/pages/design/design.wxss b/wechat_jiaxuan/pages/design/design.wxss
index cb51faa..00aeed7 100644
--- a/wechat_jiaxuan/pages/design/design.wxss
+++ b/wechat_jiaxuan/pages/design/design.wxss
@@ -1,11 +1,12 @@
.banner {
width: 100%;
- padding-bottom: 100rpx;
+ position: relative;
+ top: -100rpx;
}
.main_content {
width: 670rpx;
position: relative;
- top: -100rpx;
+ top: -120rpx;
margin: 0 auto;
background: #FFFFFF;
box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(0, 0, 0, 0.14);
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index de0fb5a..f186350 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -51,7 +51,7 @@
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
<button class="item btn">
- <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.collection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
<image wx:else data-code="collect" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
<view class="name">鏀惰棌</view>
</button>
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.less b/wechat_jiaxuan/pages/detailDis/realpic.less
index bfdd41e..4a93520 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.less
+++ b/wechat_jiaxuan/pages/detailDis/realpic.less
@@ -9,7 +9,10 @@
color: #222222;
margin: 32rpx 0;
}
-
+ .desc{
+ margin-top: 24rpx;
+ line-height: 42rpx;
+ }
.time {
font-size: 26rpx;
color: #999999;
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxml b/wechat_jiaxuan/pages/detailDis/realpic.wxml
index 12ca0ae..277ecb0 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.wxml
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxml
@@ -2,7 +2,7 @@
<view class="main_title">{{ info.title }}</view>
<view class="time">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
<image class="info_item" wx:for="{{ info.contentImgList }}" src="{{ item }}" mode="widthFix"></image>
- <view>{{ info.contentText || '' }}</view>
+ <view class="desc">{{ info.contentText || '' }}</view>
<!-- <view class="list">
<view class="item">
<image src="" mode="widthFix" />
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxss b/wechat_jiaxuan/pages/detailDis/realpic.wxss
index 76f9782..02d76c5 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.wxss
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxss
@@ -10,6 +10,10 @@
color: #222222;
margin: 32rpx 0;
}
+.container .desc {
+ margin-top: 24rpx;
+ line-height: 42rpx;
+}
.container .time {
font-size: 26rpx;
color: #999999;
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index 3828fd4..a4274e7 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -23,7 +23,7 @@
showWhiteHead: false,
topHeadBorder: false,
member: {},
-
+
bannerList: [],
bannerImgHeight: 0,
consultList: [],
@@ -46,16 +46,28 @@
},
onShow() {
const member = wx.getStorageSync('member')
- if(member && (member.authStatus == '1' || member.authStatus == '2')){
+ if (member && (member.authStatus == '1' || member.authStatus == '2')) {
getMemberInfo().then(res => {
- this.setData({member: res.data})
+ this.setData({
+ member: res.data
+ })
})
- }else{
- this.setData({member})
+ } else {
+ this.setData({
+ member
+ })
}
},
onLoad(options) {
- this.initData()
+ const member = wx.getStorageSync('member')
+ this.initDictData()
+ if (member && member.token) {
+ this.initData()
+ } else {
+ setTimeout(() => {
+ this.initData()
+ }, 1200)
+ }
},
changePath(e) {
let index = e.currentTarget.dataset.type
@@ -66,7 +78,9 @@
url: '/pages/webView/index',
success: function (res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', { link: that.data.testUrl })
+ res.eventChannel.emit('acceptDataFromOpenerPage', {
+ link: that.data.testUrl
+ })
}
})
break;
@@ -98,18 +112,25 @@
changeStrategy(e) {
let item = e.currentTarget.dataset.item
wx.navigateTo({
- url: `/pages/homeId/index?code=${item.code}&name=${item.name}` ,
+ url: `/pages/homeId/index?code=${item.code}&name=${item.name}`,
})
},
initData() {
// 杞挱
getHomeBanner().then(res => {
- this.setData({ bannerList: res.data })
+ this.setData({
+ bannerList: res.data
+ })
})
// 浜у搧瑙嗛
- getZhongTaiVideoPage({ pageSize: 1, pageNum: 1 }).then(res => {
- if(res.data.records && res.data.records.length > 0){
- this.setData({ productVideo: res.data.records })
+ getZhongTaiVideoPage({
+ pageSize: 1,
+ pageNum: 1
+ }).then(res => {
+ if (res.data.records && res.data.records.length > 0) {
+ this.setData({
+ productVideo: res.data.records
+ })
}
})
getZSZXCatalogs().then(res => { //蹇楄瑁呬慨
@@ -120,45 +141,62 @@
// 璧勮
getZhongTaiProductNewsPage({
catalogCode: 'product_info',
- pageSize: 6, pageNum: 1
+ pageSize: 6,
+ pageNum: 1
}).then(res => {
- if(res.data){
- this.setData({ consultList: res.data.records })
+ if (res.data) {
+ this.setData({
+ consultList: res.data.records
+ })
}
})
getCustomizedNewsList().then(res => { // 瀹氬埗鏈嶅姟
- this.setData({serviceList: res.data || []})
+ this.setData({
+ serviceList: res.data || []
+ })
})
+ },
+ initDictData() {
// 椋庢牸娴嬭瘯
getDictData({
code: 'WX_MINI_CONFIG',
label: 'ZBOM_STYLE_TEST_URL'
}).then(res => {
- this.setData({ testUrl: res.data.code })
+ this.setData({
+ testUrl: res.data.code
+ })
})
getDictData({
code: 'WEIXIN_DEFAULT_IMGS',
label: 'HOME_CLASS_A'
}).then(res => {
- this.setData({ HOME_CLASS_A: res.data.code })
+ this.setData({
+ HOME_CLASS_A: res.data.code
+ })
})
getDictData({
code: 'WEIXIN_DEFAULT_IMGS',
label: 'HOME_CLASS_B'
}).then(res => {
- this.setData({ HOME_CLASS_B: res.data.code })
+ this.setData({
+ HOME_CLASS_B: res.data.code
+ })
})
getDictData({
code: 'WEIXIN_DEFAULT_IMGS',
label: 'HOME_CLASS_B2'
}).then(res => {
- this.setData({ HOME_CLASS_B2: res.data.code })
+ this.setData({
+ HOME_CLASS_B2: res.data.code
+ })
})
getDictData({
code: 'WEIXIN_DEFAULT_IMGS',
label: 'HOME_CLASS_C'
}).then(res => {
- this.setData({ HOME_CLASS_C: res.data.code })
+ this.setData({
+ HOME_CLASS_C: res.data.code
+ })
})
},
jumpProVideo() {
@@ -167,12 +205,17 @@
})
},
videoClick(e) {
- const { videourl } = e.currentTarget.dataset
+ const {
+ videourl
+ } = e.currentTarget.dataset
wx.previewMedia({
- sources: [{ url: videourl, type: 'video' }]
+ sources: [{
+ url: videourl,
+ type: 'video'
+ }]
})
},
- goserHeight:function (e) {
+ goserHeight: function (e) {
const serviceHeight = e.detail.height
this.setData({
serviceHeight: serviceHeight
@@ -185,29 +228,52 @@
})
},
consultbindload(e) {
- const { height, width } = e.detail
+ const {
+ height,
+ width
+ } = e.detail
let activeHeight = height * 670 / width
this.setData({
consultImgHeight: activeHeight
})
},
+ consultClick(e) {
+ const id = e.currentTarget.dataset.id
+ actionDo({
+ actionType: 'view',
+ id: id
+ })
+ wx.navigateTo({
+ url: '/pages/consult/detail?id=' + id
+ })
+ },
bannerClick(e) {
- const { id } = e.currentTarget.dataset
+ const {
+ id
+ } = e.currentTarget.dataset
const item = e.currentTarget.dataset.item
console.log('item', item);
- actionDo({actionType: 'view',id: item.id})
- if(item.openType == 'video'){
- wx.previewMedia({
- sources: [{ url: item.openContent, type: 'video' }]
+ if(item.openType){
+ actionDo({
+ actionType: 'view',
+ id: item.id
})
}
- if(item.openType == 'link'){
+ if (item.openType == 'video') {
+ wx.previewMedia({
+ sources: [{
+ url: item.openContent,
+ type: 'video'
+ }]
+ })
+ }
+ if (item.openType == 'link') {
wx.navigateTo({
url: '/pages/webView/index?link=' + item.openContent,
})
}
- if(item.openType == 'page'){
- getApp().globalData.catalogCode=item.openContent
+ if (item.openType == 'page') {
+ getApp().globalData.catalogCode = item.openContent
wx.switchTab({
url: '/pages/discover/discover'
})
@@ -215,17 +281,20 @@
// getHomeBannerDetail({id})
},
seriveClick(e) {
- const { id, title } = e.currentTarget.dataset
- if(title === '涓撳睘瀹㈡湇'){
+ const {
+ id,
+ title
+ } = e.currentTarget.dataset
+ if (title === '涓撳睘瀹㈡湇') {
wx.navigateTo({
url: `/pages/kefu/index?title=${title}&id=${id}`,
})
- }else{
+ } else {
wx.navigateTo({
url: `/pages/kefu/service?title=${title}&id=${id}`,
})
}
-
+
},
jumpProConsult() {
wx.switchTab({
@@ -235,38 +304,63 @@
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
- onReady() {
- },
onPageScroll(e) {
let scrollTop = e.scrollTop / 100
if (scrollTop <= 0.1) {
- this.setData({ font_color: '#ffffff' })
+ this.setData({
+ font_color: '#ffffff'
+ })
} else if (scrollTop >= 0.1 && scrollTop < 0.2) {
- this.setData({ font_color: '#d0d0d0' })
+ this.setData({
+ font_color: '#d0d0d0'
+ })
} else if (scrollTop >= 0.2 && scrollTop < 0.3) {
- this.setData({ font_color: '#bdbdbd' })
+ this.setData({
+ font_color: '#bdbdbd'
+ })
} else if (scrollTop >= 0.3 && scrollTop < 0.4) {
- this.setData({ font_color: '#a1a1a1' })
+ this.setData({
+ font_color: '#a1a1a1'
+ })
} else if (scrollTop >= 0.4 && scrollTop < 0.5) {
- this.setData({ font_color: '#878787' })
+ this.setData({
+ font_color: '#878787'
+ })
} else if (scrollTop >= 0.5 && scrollTop < 0.6) {
- this.setData({ font_color: '#6d6d6d' })
+ this.setData({
+ font_color: '#6d6d6d'
+ })
} else if (scrollTop >= 0.6 && scrollTop < 0.7) {
- this.setData({ font_color: '#535353' })
+ this.setData({
+ font_color: '#535353'
+ })
} else if (scrollTop >= 0.7 && scrollTop < 0.8) {
- this.setData({ font_color: '#3b3b3b' })
+ this.setData({
+ font_color: '#3b3b3b'
+ })
} else if (scrollTop >= 0.8 && scrollTop < 0.9) {
- this.setData({ font_color: '#282828' })
+ this.setData({
+ font_color: '#282828'
+ })
} else if (scrollTop >= 0.9) {
- this.setData({ font_color: '#000000' })
+ this.setData({
+ font_color: '#000000'
+ })
}
if (scrollTop > 0) {
- this.setData({ showWhiteHead: true })
- } else{
- this.setData({ showWhiteHead: false })
+ this.setData({
+ showWhiteHead: true
+ })
+ } else {
+ this.setData({
+ showWhiteHead: false
+ })
}
- this.setData({ topHeadStyle: scrollTop, top: scrollTop })
+ this.setData({
+ topHeadStyle: scrollTop,
+ top: scrollTop
+ })
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
diff --git a/wechat_jiaxuan/pages/index/index.less b/wechat_jiaxuan/pages/index/index.less
index 0e1ef18..6d34ac1 100644
--- a/wechat_jiaxuan/pages/index/index.less
+++ b/wechat_jiaxuan/pages/index/index.less
@@ -19,6 +19,15 @@
image {
width: 100%;
}
+ .scroll_text{
+ height: 100rpx;
+ width: 670rpx;
+ white-space: nowrap;
+ overflow: hidden;//鏂囨湰瓒呭嚭闅愯棌
+ text-overflow: ellipsis;
+ padding-top: 20rpx;
+ font-size: 32rpx;
+ }
}
.logo_wrap {
@@ -26,9 +35,8 @@
display: flex;
justify-content: center;
align-items: center;
- padding: 60rpx 0;
+ padding: 0 0 60rpx;
background-color: #fff;
-
.logo {
width: 246rpx;
}
diff --git a/wechat_jiaxuan/pages/index/index.wxml b/wechat_jiaxuan/pages/index/index.wxml
index d7cab13..6d1d5fb 100644
--- a/wechat_jiaxuan/pages/index/index.wxml
+++ b/wechat_jiaxuan/pages/index/index.wxml
@@ -75,27 +75,27 @@
<view class="line">
<view class="line_left item" data-item="{{ ZSZXCata.qwsj }}" bindtap="changeStrategy">
<image src="{{HOME_CLASS_A}}"></image>
- <text>{{ ZSZXCata.qwsj.name }}</text>
+ <!-- <text>{{ ZSZXCata.qwsj.name }}</text> -->
</view>
<view class="line_right">
<view class="item" data-item="{{ ZSZXCata.cfsj }}" bindtap="changeStrategy">
<image src="{{ HOME_CLASS_B }}"></image>
- <text>{{ ZSZXCata.cfsj.name }}</text>
+ <!-- <text>{{ ZSZXCata.cfsj.name }}</text> -->
</view>
<view class="item" data-item="{{ ZSZXCata.snsj }}" bindtap="changeStrategy">
<image src="{{ HOME_CLASS_B2 }}"></image>
- <text>{{ ZSZXCata.snsj.name }}</text>
+ <!-- <text>{{ ZSZXCata.snsj.name }}</text> -->
</view>
</view>
</view>
<view data-item="{{ ZSZXCata.jdId }}" bindtap="changeStrategy" class="home_id item">
<image src="{{HOME_CLASS_C}}"></image>
- <text>{{ ZSZXCata.jdId.name }}</text>
+ <!-- <text>{{ ZSZXCata.jdId.name }}</text> -->
</view>
</view>
<!-- 鍜ㄨ -->
- <view class="consult" bindtap="jumpProConsult">
- <view class="com_header">
+ <view class="consult">
+ <view class="com_header" bindtap="jumpProConsult">
<view class="left">
<view class="name">
<image class="icon" src="../../static/icon/home_ic_zixun@2x.png"></image>
@@ -105,11 +105,11 @@
</view>
<image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
</view>
- <swiper class="consult_swiper" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" style="height:{{consultImgHeight}}rpx" duration="{{ bannerSwiperOption.duration }}">
+ <swiper class="consult_swiper" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" style="height:{{consultImgHeight + 100}}rpx" duration="{{ bannerSwiperOption.duration }}">
<block wx:for="{{ consultList }}" wx:key="index">
- <swiper-item>
+ <swiper-item data-id="{{ item.id }}" bindtap="consultClick">
<image bindload="consultbindload" mode="widthFix" src="{{ item.coverImage }}"></image>
-
+ <view class="scroll_text">{{ item.title }}</view>
</swiper-item>
</block>
</swiper>
diff --git a/wechat_jiaxuan/pages/index/index.wxss b/wechat_jiaxuan/pages/index/index.wxss
index 783b089..8962a9f 100644
--- a/wechat_jiaxuan/pages/index/index.wxss
+++ b/wechat_jiaxuan/pages/index/index.wxss
@@ -18,12 +18,21 @@
.container .consult_swiper image {
width: 100%;
}
+.container .consult_swiper .scroll_text {
+ height: 100rpx;
+ width: 670rpx;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ padding-top: 20rpx;
+ font-size: 32rpx;
+}
.container .logo_wrap {
width: 100%;
display: flex;
justify-content: center;
align-items: center;
- padding: 60rpx 0;
+ padding: 0 0 60rpx;
background-color: #fff;
}
.container .logo_wrap .logo {
diff --git a/wechat_jiaxuan/pages/sets/index.js b/wechat_jiaxuan/pages/sets/index.js
index 6dab455..67eae09 100644
--- a/wechat_jiaxuan/pages/sets/index.js
+++ b/wechat_jiaxuan/pages/sets/index.js
@@ -25,7 +25,10 @@
wx.removeStorageSync('token')
wx.removeStorageSync('member')
wx.removeStorageSync('code')
- wx.redirectTo({
+ wx.showToast({
+ title: '娉ㄩ攢鎴愬姛',
+ })
+ wx.switchTab({
url: '/pages/index/index',
})
})
diff --git a/wechat_jiaxuan/pages/sets/index.wxml b/wechat_jiaxuan/pages/sets/index.wxml
index ff8eab0..525647e 100644
--- a/wechat_jiaxuan/pages/sets/index.wxml
+++ b/wechat_jiaxuan/pages/sets/index.wxml
@@ -14,7 +14,7 @@
</view>
</view>
<!-- -->
- <van-popup show="{{ show }}" bind:close="onClose">
+ <van-popup show="{{ show }}" round bind:close="onClose">
<view class="modal">
<view class="title">娉ㄩ攢鎻愰啋</view>
<view class="text">濡傛偍涓嶅啀浣跨敤姝よ处鍙凤紝鍙互灏嗗叾娉ㄩ攢銆傝处鍙锋垚鍔熸敞閿�鍚庯紝鍏朵笅鎵�鏈夋暟鎹皢浼氳鍒犻櫎骞跺皢鏃犳硶鎭㈠锛岃璋ㄦ厧鎿嶄綔</view>
diff --git a/wechat_jiaxuan/project.private.config.json b/wechat_jiaxuan/project.private.config.json
index 6960984..065ed7b 100644
--- a/wechat_jiaxuan/project.private.config.json
+++ b/wechat_jiaxuan/project.private.config.json
@@ -39,7 +39,7 @@
},
{
"name": "",
- "pathName": "pages/store/staffList",
+ "pathName": "pages/auth/auth",
"query": "",
"launchMode": "default",
"scene": null
diff --git a/wechat_jiaxuan/static/tabbar/nav_mendianAc.png b/wechat_jiaxuan/static/tabbar/nav_mendianAc.png
index 56ecd63..d02fb40 100644
--- a/wechat_jiaxuan/static/tabbar/nav_mendianAc.png
+++ b/wechat_jiaxuan/static/tabbar/nav_mendianAc.png
Binary files differ
diff --git a/wechat_jiaxuan/utils/request.js b/wechat_jiaxuan/utils/request.js
index fbd20fd..7d2a0ea 100644
--- a/wechat_jiaxuan/utils/request.js
+++ b/wechat_jiaxuan/utils/request.js
@@ -20,40 +20,9 @@
if (res.data.code === 200) {
resolve(res.data || true)
} else {
- // if(res.data.code == 5112){
- // wx.navigateTo({
- // url: '/pages/auth/auth ',
- // })
- // }
if(res.data.code == 5111 || res.data.code == 5112){
- wx.login({
- timeout: 5000,
- success(res) {
- if (res.code) {
- //鍙戣捣缃戠粶璇锋眰
- wxLoginCustomer({
- code: res.code
- }).then(res => {
- console.log(res)
- if (res && res.data.member) {
- wx.switchTab({
- url: '/pages/index/index',
- })
- wx.setStorageSync('member', res.data.member)
- wx.setStorageSync('openid', res.data.member.openid)
- wx.setStorageSync('sessionKey', res.data.sessionKey)
- wx.setStorageSync('token', res.data.token)
- } else {
- console.log('鐧诲綍澶辫触锛�')
- }
- })
- } else {
- console.log('鐧诲綍澶辫触锛�' + res)
- }
- },
- fail(err) {
- console.log(err)
- }
+ wx.switchTab({
+ url: '/pages/index/index',
})
}
res.data.message && wx.showToast({
diff --git a/wechat_staff/api/index.js b/wechat_staff/api/index.js
index 0a9f095..7ede73e 100644
--- a/wechat_staff/api/index.js
+++ b/wechat_staff/api/index.js
@@ -26,16 +26,15 @@
// 鑾峰彇鎵嬫満鍙�
export const getWxMiniPhone = (data) => {
return request({
- url: '/web/customer/getWxMiniPhone',
+ url: '/web/personnel/getWxMiniPhoneLogin',
method: "POST",
data
})
}
-// 缁戝畾鎵嬫満鍙�
-export const binDingPhone = (data) => {
+// 缁戝畾Openid
+export const bindingOpenid = (data) => {
return request({
- url: '/web/customer/binDingPhone',
- method: "POST",
+ url: '/web/personnel/bindingOpenid',
data
})
}
diff --git a/wechat_staff/app.js b/wechat_staff/app.js
index ca43848..d83da7c 100644
--- a/wechat_staff/app.js
+++ b/wechat_staff/app.js
@@ -1,4 +1,6 @@
-import { wxLoginCustomer } from './api/index'
+import {
+ wxLoginCustomer
+} from './api/index'
App({
globalData: {
primary: '#B08771',
@@ -9,45 +11,36 @@
const WindowInfo = wx.getWindowInfo()
if (WindowInfo.safeArea.top > 20) {
this.globalData.bottomLift = WindowInfo.screenHeight - WindowInfo.safeArea.bottom;
- }
- const res = wx.getStorageSync('member')
- if (res) {
- this.globalData.userInfo = res
- console.error("res",res)
- } else {
- // 鐧诲綍
- wx.login({
- timeout: 5000,
- success(res) {
- if (res.code) {
- //鍙戣捣缃戠粶璇锋眰
- wxLoginCustomer({
- code: res.code
- }).then(res => {
- console.log(res)
- if (res && res.data.users) {
- wx.setStorageSync('member', res.data.users)
- wx.setStorageSync('openid', res.data.users.openid)
- wx.setStorageSync('sessionKey', res.data.sessionKey)
- wx.setStorageSync('token', res.data.token)
- } else {
- wx.navigateTo({
- url: '/pages/login/index',
- })
- console.log('鐧诲綍澶辫触锛�')
- }
- })
- } else {
- wx.navigateTo({
- url: '/pages/login/index',
- })
- console.log('鐧诲綍澶辫触锛�' + res)
- }
- },
- fail(err) {
- console.log(err)
- }
- })
}
+ wx.login({
+ timeout: 5000,
+ success(res) {
+ if (res.code) {
+ //鍙戣捣缃戠粶璇锋眰
+ wxLoginCustomer({
+ code: res.code
+ }).then(res => {
+ if (res && res.data) {
+ wx.setStorageSync('member', res.data.users || '')
+ wx.setStorageSync('sessionKey', res.data.sessionKey)
+ wx.setStorageSync('token', res.data.token || '')
+ } else {
+ wx.navigateTo({
+ url: '/pages/login/index',
+ })
+ console.log('鐧诲綍澶辫触锛�')
+ }
+ })
+ } else {
+ wx.navigateTo({
+ url: '/pages/login/index',
+ })
+ console.log('鐧诲綍澶辫触锛�' + res)
+ }
+ },
+ fail(err) {
+ console.log(err)
+ }
+ })
}
-})
+})
\ No newline at end of file
diff --git a/wechat_staff/pages/login/index.js b/wechat_staff/pages/login/index.js
index 1371551..2d85c94 100644
--- a/wechat_staff/pages/login/index.js
+++ b/wechat_staff/pages/login/index.js
@@ -1,4 +1,10 @@
-import { sendSms,loginByPhone, getDictData } from '../../api/index'
+import {
+ sendSms,
+ getDictData,
+ getWxMiniPhone,
+ loginByPhone,
+ bindingOpenid
+} from '../../api/index'
Page({
/**
@@ -10,15 +16,17 @@
status: '0', // 鏍囪瘑
countDown: 0,
phone: '',
- code: '',
+ code: '',
showModal: false,
activeHtml: '',
},
getCode() {
let countDown = this.data.countDown
- if(countDown > 0) return
- const { phone } = this.data
- if(!phone || phone.length != 11){
+ if (countDown > 0) return
+ const {
+ phone
+ } = this.data
+ if (!phone || phone.length != 11) {
return wx.showToast({
title: '璇疯緭鍏ユ纭殑鎵嬫満鍙�',
icon: 'none'
@@ -31,34 +39,61 @@
title: '楠岃瘉鐮佸彂閫佹垚鍔�',
icon: 'none'
})
- this.setData({ countDown: 60 })
+ this.setData({
+ countDown: 60
+ })
let timer = setInterval(() => {
let countDown = this.data.countDown
- if(countDown === 0){
+ if (countDown === 0) {
return clearInterval(timer)
}
- countDown --
- this.setData({ countDown })
+ countDown--
+ this.setData({
+ countDown
+ })
}, 1000)
})
},
loginPhone() {
- const { code, phone } = this.data
- loginByPhone({code, phone}).then(res => {
- wx.setStorageSync('member', res.data.users)
- wx.setStorageSync('token', res.data.token)
- wx.showToast({
- title: '鐧诲綍鎴愬姛',
- })
- setTimeout(() => {
- wx.switchTab({
- url: '/pages/index/index',
+ const {
+ code,
+ phone
+ } = this.data
+ loginByPhone({
+ code,
+ phone
+ }).then(res => {
+ if (res.data && res.data.token) {
+ wx.login({
+ timeout: 5000,
+ success: (loginRes) => {
+ if (loginRes.code) {
+ this.bindingOpenid(loginRes.code, res.data.token)
+ }
+ }
})
- }, 300)
+ if(res.data.phone){
+ res.data.users.phone = res.data.phone || res.data.users.phone
+ }
+ wx.setStorageSync('member', res.data.users)
+ wx.setStorageSync('token', res.data.token)
+ wx.showToast({
+ title: '鐧诲綍鎴愬姛',
+ })
+ setTimeout(() => {
+ wx.switchTab({
+ url: '/pages/index/index',
+ })
+ }, 300)
+ }else{
+ wx.showToast({
+ title: '浣犺繕涓嶆槸璇ョ郴缁熺敤鎴凤紝璇疯仈绯荤浉鍏崇鐞嗗憳娉ㄥ唽',
+ })
+ }
})
},
changeStatus() {
- if(!this.data.agreementFalg){
+ if (!this.data.agreementFalg) {
return wx.showToast({
title: '璇峰厛闃呰骞跺悓鎰忕浉鍏冲崗璁�',
icon: 'none'
@@ -80,9 +115,61 @@
})
this.initData()
},
- onOpen(e){
- const { serviceHtml, privacyHtml } = this.data
- const { index } = e.target.dataset
+ getPhoneNumber(e) {
+ const data = {
+ ...e.detail
+ }
+ getWxMiniPhone({
+ encryptedData: data.encryptedData,
+ iv: data.iv,
+ sessionKey: wx.getStorageSync('sessionKey') || data.iv,
+ }).then(res => {
+ if (res.data && res.data.token) {
+ wx.login({
+ timeout: 5000,
+ success: (loginRes) => {
+ if (loginRes.code) {
+ this.bindingOpenid(loginRes.code, res.data.token)
+ }
+ }
+ })
+ if(res.data.phone){
+ res.data.users.phone = res.data.phone || res.data.users.phone
+ }
+ wx.setStorageSync('member', res.data.users)
+ wx.setStorageSync('token', res.data.token)
+ wx.switchTab({
+ url: '/pages/index/index',
+ })
+ }else{
+ wx.showToast({
+ title: '浣犺繕涓嶆槸璇ョ郴缁熺敤鎴凤紝璇疯仈绯荤浉鍏崇鐞嗗憳娉ㄥ唽',
+ })
+ }
+
+ })
+ },
+ bindingOpenid(code, token) {
+ bindingOpenid({code, token})
+ },
+ loginIn() {
+ const {
+ agreementFalg
+ } = this.data
+ if (!agreementFalg) return wx.showToast({
+ title: '璇峰厛闃呰骞跺悓鎰忕浉鍏冲崗璁�',
+ icon: 'none',
+ duration: 2000
+ })
+ },
+ onOpen(e) {
+ const {
+ serviceHtml,
+ privacyHtml
+ } = this.data
+ const {
+ index
+ } = e.target.dataset
let activeHtml = index == '0' ? serviceHtml : privacyHtml
this.setData({
activeHtml,
@@ -90,9 +177,11 @@
})
},
onClose() {
- this.setData({showModal: false})
+ this.setData({
+ showModal: false
+ })
},
- initData(){
+ initData() {
getDictData({
code: 'ZBOM_CUSTOMIZED',
label: 'SERVER_AGREEMENT'
diff --git a/wechat_staff/pages/login/index.json b/wechat_staff/pages/login/index.json
index 16640fe..127c355 100644
--- a/wechat_staff/pages/login/index.json
+++ b/wechat_staff/pages/login/index.json
@@ -2,7 +2,8 @@
"usingComponents": {
"van-checkbox": "@vant/weapp/checkbox/index",
"van-field": "@vant/weapp/field/index",
- "van-popup": "@vant/weapp/popup/index"
+ "van-popup": "@vant/weapp/popup/index",
+ "mp-html": "mp-html"
},
"navigationStyle": "default",
"navigationBarTitleText": "鐧诲綍"
diff --git a/wechat_staff/pages/login/index.less b/wechat_staff/pages/login/index.less
index c1e6740..a63107c 100644
--- a/wechat_staff/pages/login/index.less
+++ b/wechat_staff/pages/login/index.less
@@ -60,7 +60,8 @@
}
}
.modal{
- width: 600rpx;
+ width: 100%;
+ max-height: 1120rpx;
min-height: 600rpx;
- padding: 30rpx;
+ padding: 40rpx;
}
\ No newline at end of file
diff --git a/wechat_staff/pages/login/index.wxml b/wechat_staff/pages/login/index.wxml
index 5e6cc05..0ad9d90 100644
--- a/wechat_staff/pages/login/index.wxml
+++ b/wechat_staff/pages/login/index.wxml
@@ -5,7 +5,8 @@
<!-- -->
<view class="btns">
<block wx:if="{{ status == '0' }}">
- <view class="btn speedy">鎵嬫満鍙峰揩鎹风櫥褰�</view>
+ <button class="btn speedy" wx:if="{{ !agreementFalg }}" bindtap="loginIn">鎵嬫満鍙峰揩鎹风櫥褰�</button>
+ <button wx:else class="btn speedy" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">鎵嬫満鍙峰揩鎹风櫥褰�</button>
<view bindtap="changeStatus" class="btn">鎵嬫満楠岃瘉鐮佺櫥褰�</view>
</block>
<block wx:if="{{ status == '1' }}">
@@ -32,9 +33,9 @@
</view>
</view>
<!-- -->
- <van-popup show="{{ showModal }}" round bind:close="onClose">
+ <van-popup position="bottom" show="{{ showModal }}" round bind:close="onClose">
<view class="modal">
- <rich-text nodes="{{activeHtml}}"></rich-text>
+ <mp-html content="{{activeHtml}}"></mp-html>
</view>
</van-popup>
</view>
\ No newline at end of file
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index a6b251c..43f582f 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,7 +1,7 @@
-// export const baseUrl = 'https://jiaxuan.zbom.com/jx/wechat/' //姝ｅ紡鏈嶅姟鍣�
-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