From 2bd2684d71fdfed5ff1ff1ea821d01f245c2623f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 02 八月 2024 09:56:20 +0800
Subject: [PATCH] ''
---
wechat_jiaxuan/pages/design/design.js | 3 +
wechat_staff/pages/kefu/index.wxml | 6 ++
wechat_jiaxuan/pages/userinfo/index.wxss | 5 ++
wechat_jiaxuan/pages/design/design.less | 1
wechat_jiaxuan/pages/userinfo/index.wxml | 10 +++-
wechat_jiaxuan/pages/design/design.wxml | 2
wechat_jiaxuan/pages/design/design.wxss | 1
wechat_jiaxuan/pages/index/index.wxml | 2
wechat_jiaxuan/pages/userinfo/index.json | 3 +
wechat_staff/pages/kefu/index.js | 7 +++
wechat_jiaxuan/pages/userinfo/index.less | 5 ++
wechat_jiaxuan/pages/index/index.js | 25 +++++++-----
12 files changed, 52 insertions(+), 18 deletions(-)
diff --git a/wechat_jiaxuan/pages/design/design.js b/wechat_jiaxuan/pages/design/design.js
index b0d9c9b..0c928b0 100644
--- a/wechat_jiaxuan/pages/design/design.js
+++ b/wechat_jiaxuan/pages/design/design.js
@@ -50,7 +50,8 @@
})
const member = wx.getStorageSync('member')
this.setData({
- phone: member.phone
+ phone: member.phone,
+ name: member.name
})
},
regionChange(e) {
diff --git a/wechat_jiaxuan/pages/design/design.less b/wechat_jiaxuan/pages/design/design.less
index d214c40..1122c15 100644
--- a/wechat_jiaxuan/pages/design/design.less
+++ b/wechat_jiaxuan/pages/design/design.less
@@ -45,6 +45,7 @@
}
.icon {
width: 40rpx;
+ height: 32rpx;
}
.city{
flex: 1;
diff --git a/wechat_jiaxuan/pages/design/design.wxml b/wechat_jiaxuan/pages/design/design.wxml
index d01cfad..e7941e5 100644
--- a/wechat_jiaxuan/pages/design/design.wxml
+++ b/wechat_jiaxuan/pages/design/design.wxml
@@ -18,7 +18,7 @@
{{ addr.provinceName }}{{ addr.cityName }}{{ addr.areaName }}
</view>
</picker> -->
- <areaSel bindchange="regionChange" placeholder="璇烽�夋嫨鎵�鍦ㄥ尯鍩�" value="{{['210000000','210500000','210501000']}}" />
+ <areaSel class="city_picler" bindchange="regionChange" placeholder="璇烽�夋嫨鎵�鍦ㄥ尯鍩�" value="{{['210000000','210500000','210501000']}}" />
<image class="arrow_right" src="../../static/icon/arrow_right.png" mode="widthFix"></image>
</view>
<view class="btn" bindtap="onSubmit">绔嬪嵆鎶ュ悕</view>
diff --git a/wechat_jiaxuan/pages/design/design.wxss b/wechat_jiaxuan/pages/design/design.wxss
index beb4357..6ad5800 100644
--- a/wechat_jiaxuan/pages/design/design.wxss
+++ b/wechat_jiaxuan/pages/design/design.wxss
@@ -44,6 +44,7 @@
}
.main_content .line .icon {
width: 40rpx;
+ height: 32rpx;
}
.main_content .line .city {
flex: 1;
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index 02195f8..83ca914 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -65,7 +65,6 @@
rect.top // 鑺傜偣鐨勪笂杈圭晫鍧愭爣
rect.bottom // 鑺傜偣鐨勪笅杈圭晫鍧愭爣
}).exec(res => {
- console.log('res', res);
console.log(windowInfo.windowHeight)
this.setData({ videoTop: res[0].top,windowHeight: windowInfo.windowHeight})
})
@@ -93,15 +92,21 @@
let that = this
switch (index) {
case '0':
- wx.navigateTo({
- url: '/pages/webView/index',
- success: function (res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', {
- link: that.data.testUrl
- })
- }
- })
+ if (member && member.phone) {
+ wx.navigateTo({
+ url: '/pages/webView/index',
+ success: function (res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('acceptDataFromOpenerPage', {
+ link: that.data.testUrl
+ })
+ }
+ })
+ } else {
+ wx.navigateTo({
+ url: '/pages/auth/auth',
+ })
+ }
break;
case '1':
diff --git a/wechat_jiaxuan/pages/index/index.wxml b/wechat_jiaxuan/pages/index/index.wxml
index ec86e1e..99a448d 100644
--- a/wechat_jiaxuan/pages/index/index.wxml
+++ b/wechat_jiaxuan/pages/index/index.wxml
@@ -31,7 +31,7 @@
<view class="item" data-type="2" bindtap="changePath">
<image class="img" src="../../static/icon/home_ic_liangchi@2x.png"></image>
<view class="name">鍏嶈垂閲忓昂</view>
- <view class="placeholder9">鍒嗘瀽灏忓府鎵�</view>
+ <view class="placeholder9">涓�瀵逛竴璁捐鏈嶅姟</view>
</view>
<view class="item" data-type="1" bindtap="changePath">
<image class="img" src="../../static/icon/home_ic_yusuan@2x.png"></image>
diff --git a/wechat_jiaxuan/pages/userinfo/index.json b/wechat_jiaxuan/pages/userinfo/index.json
index a1915c3..7fa5209 100644
--- a/wechat_jiaxuan/pages/userinfo/index.json
+++ b/wechat_jiaxuan/pages/userinfo/index.json
@@ -1,7 +1,8 @@
{
"usingComponents": {
"van-field": "@vant/weapp/field/index",
- "van-popup": "@vant/weapp/popup/index"
+ "van-popup": "@vant/weapp/popup/index",
+ "areaSel": "/components/areaSel/areaSel"
},
"navigationBarTitleText": "涓汉璧勬枡"
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/index.less b/wechat_jiaxuan/pages/userinfo/index.less
index ebc3d24..0b40afa 100644
--- a/wechat_jiaxuan/pages/userinfo/index.less
+++ b/wechat_jiaxuan/pages/userinfo/index.less
@@ -33,6 +33,11 @@
.picker_wrap{
width: 528rpx;
display: flex;
+ border: 1px solid red;
+ .city_picler{
+ flex: 1;
+ border: 1px solid;
+ }
}
.text{
flex: 1;
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxml b/wechat_jiaxuan/pages/userinfo/index.wxml
index dcd2459..dd91ffb 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxml
+++ b/wechat_jiaxuan/pages/userinfo/index.wxml
@@ -5,7 +5,7 @@
<view class="line">
<view class="label">鏄电О</view>
<view class="val">
- <input placeholder="璇疯緭鍏ユ樀绉�" placeholder-class="placeholder9" bindchange="getNickName" value="{{ nickname }}" maxlength="{{ 10 }}" type="nickname"/>
+ <input placeholder="璇疯緭鍏ユ樀绉�" placeholder-class="placeholder9" bindchange="getNickName" value="{{ nickname }}" maxlength="{{ 10 }}" type="nickname" />
</view>
</view>
<view class="line">
@@ -23,7 +23,11 @@
<view class="label">鍩庡競</view>
<view class="val">
<view class="df_ac" style="width: 100%">
- <picker class="picker" mode="region" value="{{ addr }}" bindchange="positionChange">
+ <view class="picker_wrap">
+ <areaSel class="city_picler" bindchange="regionChange" placeholder="璇烽�夋嫨鎵�鍦ㄥ尯鍩�" value="{{['210000000','210500000','210501000']}}" />
+ <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
+ </view>
+ <!-- <picker class="picker" mode="region" value="{{ addr }}" bindchange="positionChange">
<view class="picker_wrap">
<view class="text placeholder9" hidden="{{ addr.cityName }}">璇烽�夋嫨鍩庡競</view>
<view class="text" hidden="{{ !addr.cityName }}">
@@ -31,7 +35,7 @@
</view>
<image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
</view>
- </picker>
+ </picker> -->
</view>
</view>
</view>
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxss b/wechat_jiaxuan/pages/userinfo/index.wxss
index 936b5aa..d8b2294 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxss
+++ b/wechat_jiaxuan/pages/userinfo/index.wxss
@@ -36,6 +36,11 @@
.list .line .picker .picker_wrap {
width: 528rpx;
display: flex;
+ border: 1px solid red;
+}
+.list .line .picker .picker_wrap .city_picler {
+ flex: 1;
+ border: 1px solid;
}
.list .line .picker .text {
flex: 1;
diff --git a/wechat_staff/pages/kefu/index.js b/wechat_staff/pages/kefu/index.js
index 66bd51c..3f700ce 100644
--- a/wechat_staff/pages/kefu/index.js
+++ b/wechat_staff/pages/kefu/index.js
@@ -21,6 +21,13 @@
this.getDetail(options.id)
}
},
+ handleShare() {
+ wx.navigateToMiniProgram({
+ appId: 'wxcd2b89fd2ff065f8',
+ path: `/pages/kefu/index`,
+ envVersion: 'trial'
+ })
+ },
getDetail(id) {
getCustomizedNewsDetail({id}).then(res => {
this.setData({
diff --git a/wechat_staff/pages/kefu/index.wxml b/wechat_staff/pages/kefu/index.wxml
index b575179..e43bb39 100644
--- a/wechat_staff/pages/kefu/index.wxml
+++ b/wechat_staff/pages/kefu/index.wxml
@@ -6,7 +6,11 @@
<!-- footer -->
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
- <button open-type="share" class="item btn" bindtap="handleShare">
+ <!-- <button open-type="share" class="item btn" bindtap="handleShare">
+ <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
+ <view class="name">鍒嗕韩</view>
+ </button> -->
+ <button class="item btn" bindtap="handleShare">
<image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
<view class="name">鍒嗕韩</view>
</button>
--
Gitblit v1.9.3