From 8d48f2f55453635bf60e5e00d1e4746288e9da67 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 22 七月 2024 15:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/userinfo/index.wxss | 11 +
wechat_jiaxuan/pages/detailDis/realpic.js | 5
wechat_jiaxuan/pages/userinfo/index.wxml | 22 +-
wechat_jiaxuan/components/disProduct/index.js | 77 ++++++-
wechat_staff/pages/client/index.wxml | 3
wechat_jiaxuan/components/disProduct/index.less | 5
wechat_jiaxuan/components/disRealpic/index.less | 10
wechat_jiaxuan/app.js | 54 ++--
wechat_jiaxuan/app.wxss | 2
wechat_jiaxuan/pages/detailDis/product.wxml | 4
wechat_jiaxuan/pages/detailDis/realpic.wxml | 4
wechat_jiaxuan/pages/userinfo/collect.js | 2
wechat_jiaxuan/pages/homeId/index.js | 3
wechat_jiaxuan/pages/design/design.less | 8
wechat_jiaxuan/pages/consult/consult.js | 3
wechat_jiaxuan/pages/design/design.wxml | 10
wechat_jiaxuan/pages/design/design.wxss | 7
wechat_jiaxuan/pages/index/index.js | 3
wechat_jiaxuan/pages/detailDis/product.js | 67 +++++-
wechat_staff/utils/config.js | 9
wechat_jiaxuan/components/disCase/index.js | 10 +
wechat_jiaxuan/pages/consult/detail.js | 3
wechat_jiaxuan/pages/mine/mine.less | 2
wechat_jiaxuan/components/disCase/index.wxml | 4
wechat_jiaxuan/pages/detailDis/case.wxml | 4
wechat_jiaxuan/pages/index/index.less | 7
wechat_staff/pages/store/staff.wxml | 2
wechat_jiaxuan/components/disCase/index.wxss | 3
wechat_jiaxuan/pages/userinfo/favorite.js | 2
wechat_staff/pages/sets/protocol.js | 4
wechat_jiaxuan/pages/userinfo/index.less | 11 +
server/service/src/main/java/com/doumee/config/annotation/UserLoginRequired.java | 4
wechat_jiaxuan/pages/consult/detail.json | 2
wechat_jiaxuan/pages/design/design.js | 40 ++-
wechat_jiaxuan/components/disRealpic/index.js | 9
wechat_jiaxuan/pages/detailDis/case.js | 15
wechat_jiaxuan/components/disCase/index.less | 3
wechat_jiaxuan/components/disRealpic/index.wxml | 16
wechat_jiaxuan/components/disRealpic/index.wxss | 10
wechat_jiaxuan/pages/index/index.wxss | 5
wechat_jiaxuan/pages/mine/mine.wxss | 2
wechat_jiaxuan/pages/userinfo/mysub.wxml | 6
wechat_jiaxuan/utils/request.js | 3
wechat_staff/api/index.js | 7
wechat_staff/pages/client/index.js | 26 +
wechat_jiaxuan/components/disProduct/index.wxss | 4
wechat_jiaxuan/pages/userinfo/collect.wxml | 6
wechat_jiaxuan/components/disProduct/index.wxml | 37 ---
48 files changed, 365 insertions(+), 191 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/config/annotation/UserLoginRequired.java b/server/service/src/main/java/com/doumee/config/annotation/UserLoginRequired.java
index 4319326..b3e74c2 100644
--- a/server/service/src/main/java/com/doumee/config/annotation/UserLoginRequired.java
+++ b/server/service/src/main/java/com/doumee/config/annotation/UserLoginRequired.java
@@ -7,4 +7,6 @@
@Target({ElementType.METHOD,ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
-public @interface UserLoginRequired {}
+public @interface UserLoginRequired {
+
+}
diff --git a/wechat_jiaxuan/app.js b/wechat_jiaxuan/app.js
index d6e5d3e..c9e2dcb 100644
--- a/wechat_jiaxuan/app.js
+++ b/wechat_jiaxuan/app.js
@@ -14,36 +14,32 @@
}
// 鎺堟潈鐧诲綍
const member = wx.getStorageSync('member')
- if (member) {
-
- } 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)
+ 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)
+ }
+ })
}
diff --git a/wechat_jiaxuan/app.wxss b/wechat_jiaxuan/app.wxss
index d14b967..cb2e460 100644
--- a/wechat_jiaxuan/app.wxss
+++ b/wechat_jiaxuan/app.wxss
@@ -1,5 +1,5 @@
-view,text{
+view,text,scroll-view,image{
box-sizing: border-box;
}
page{
diff --git a/wechat_jiaxuan/components/disCase/index.js b/wechat_jiaxuan/components/disCase/index.js
index 835f66a..4c40367 100644
--- a/wechat_jiaxuan/components/disCase/index.js
+++ b/wechat_jiaxuan/components/disCase/index.js
@@ -96,6 +96,15 @@
const index = tagCodes.indexOf(code)
if(index === -1){
+ // 鍚宲aram閲宑ode閲嶅
+ if(activeParam && activeParam.length > 0){
+ activeParam.forEach(item => {
+ const indexTemp = tagCodes.indexOf(item.labelValueCode)
+ if(indexTemp > -1){
+ tagCodes.splice(indexTemp, 1)
+ }
+ })
+ }
tagCodes.push(code)
cateList[activeIndex].paramIndex = paramIndex
cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
@@ -121,6 +130,7 @@
},
subParam() {
this.setData({ activeParam: [] })
+ this.setData({ pageNum: 1,dataList: [],total: 0})
this.getList()
},
changeShowParams(e){
diff --git a/wechat_jiaxuan/components/disCase/index.less b/wechat_jiaxuan/components/disCase/index.less
index 6e72dc4..340929d 100644
--- a/wechat_jiaxuan/components/disCase/index.less
+++ b/wechat_jiaxuan/components/disCase/index.less
@@ -31,7 +31,7 @@
height: 100%;
padding-top: 120rpx;
.query_wrap_scroll{
- width: 670rpx;
+ width: 750rpx;
padding: 0 40rpx;
}
.query_wrap {
@@ -118,6 +118,7 @@
}
}
.goods_list{
+ box-sizing: border-box;
padding: 12rpx 40rpx;
height: calc( 100% - 188rpx);
.item{
diff --git a/wechat_jiaxuan/components/disCase/index.wxml b/wechat_jiaxuan/components/disCase/index.wxml
index e571ee8..b9e38d3 100644
--- a/wechat_jiaxuan/components/disCase/index.wxml
+++ b/wechat_jiaxuan/components/disCase/index.wxml
@@ -43,9 +43,9 @@
<view class="content">
<view class="name">{{ item.title }}</view>
<view class="info">
- <image wx:if="{{ !item.isCollection }}" data-code="like" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <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 {{true ? 'primary' : ''}}">{{ item.collectCount }}</text>
+ <text class="num {{item.collection ? '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 f297271..5284738 100644
--- a/wechat_jiaxuan/components/disCase/index.wxss
+++ b/wechat_jiaxuan/components/disCase/index.wxss
@@ -31,7 +31,7 @@
padding-top: 120rpx;
}
.main_content .query_wrap_scroll {
- width: 670rpx;
+ width: 750rpx;
padding: 0 40rpx;
}
.main_content .query_wrap {
@@ -115,6 +115,7 @@
background-color: #333333;
}
.main_content .goods_list {
+ box-sizing: border-box;
padding: 12rpx 40rpx;
height: calc(100% - 188rpx);
}
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index 6fd1dbd..88d9997 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -11,10 +11,12 @@
* 缁勪欢鐨勫垵濮嬫暟鎹�
*/
data: {
- showOne: false,
- showTwo: false,
+ activeIndex: -1,
+ activeParam: [],
+ tagCodes: [],
cateList: [],
+ secondCateList: [],
datalist: [],
pageNum: 1,
pageSize: 10,
@@ -56,15 +58,19 @@
const catalogCode = this.data.catalogCode
getCataLogTagList({
catalogCode
+ }).then(res => {
+ this.setData({
+ secondCateList: res.data || [],
+ })
})
},
bindblur() {
this.getList()
},
getList() {
- const { catalogCode, pageNum, pageSize, sortType, query } = this.data
+ const { catalogCode,tagCodes, pageNum, pageSize, sortType, query } = this.data
getZhongTaiProductPage({
- catalogCode,pageNum,pageSize,sortType,query
+ catalogCode,pageNum,pageSize,sortType,query,tagCodes
}).then(res => {
this.setData({
datalist: [...this.data.datalist, ...res.data.records],
@@ -104,15 +110,62 @@
url: '/pages/detailDis/product?id=' + id,
})
},
- changeOne(){
- const showOne = !this.data.showOne
- this.setData({showOne})
- this.setData({showTwo: false})
+ tagClick(e) {
+ const code = e.currentTarget.dataset.code
+ const paramIndex = e.currentTarget.dataset.index
+ const { secondCateList, tagCodes, activeParam, activeIndex } = this.data
+ const index = tagCodes.indexOf(code)
+ console.log('code', code);
+ console.log('tagCodes', tagCodes);
+ if(index === -1){
+ // 鍚宲aram閲宑ode閲嶅
+ if(activeParam && activeParam.length > 0){
+ activeParam.forEach(item => {
+ const indexTemp = tagCodes.indexOf(item.labelValueCode)
+ if(indexTemp > -1){
+ tagCodes.splice(indexTemp, 1)
+ }
+ })
+ }
+ tagCodes.push(code)
+ secondCateList[activeIndex].paramIndex = paramIndex
+ secondCateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
+ }else{
+ tagCodes.splice(index, 1)
+ secondCateList[activeIndex].paramIndex = -1
+ secondCateList[activeIndex].paramName = ''
+ }
+ this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.setData({ tagCodes, secondCateList })
},
- changeTwo(){
- const showTwo = !this.data.showTwo
- this.setData({showTwo})
- this.setData({showOne: false})
+ changeShowParams(e){
+ const { secondCateList } = this.data
+ const activeIndex = e.currentTarget.dataset.index
+ console.log('activeIndex', activeIndex);
+ console.log('secondCateList', secondCateList);
+ if(activeIndex === this.data.activeIndex){
+ this.setData({ activeIndex: -1, activeParam: [] })
+ }else{
+ this.setData({
+ activeIndex,
+ activeParam: secondCateList[activeIndex].valueVos
+ })
+ }
+ console.log('activeParam', this.data.activeParam);
+ // this.setData({showTwo: false})
+ },
+ cancelParam() {
+ const { secondCateList } = this.data
+ secondCateList.forEach(item => {
+ item.paramIndex = -1
+ item.paramName = ''
+ })
+ this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
+ },
+ subParam() {
+ this.setData({ activeParam: [] })
+ this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.getList()
},
}
})
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index ccb6a20..f64afe7 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -157,15 +157,16 @@
.goods_list {
height: calc( 100% - 182rpx);
+ width: 590rpx;
display: flex;
flex-wrap: wrap;
+ box-sizing: border-box;
justify-content: space-between;
padding: 12rpx 40rpx;
.item {
- width: 50%;
+ width: 242rpx;
flex-shrink: 0;
margin-bottom: 32rpx;
-
.img_wrap {
width: 242rpx;
border-radius: 8rpx;
diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index d993b9d..9ca1a53 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -14,39 +14,18 @@
</scroll-view>
<view class="main_right">
<view class="query_wrap">
- <view class="item" bindtap="changeOne">
- <view class="name">瑁呬慨椋庢牸</view>
- <van-icon name="{{ showOne ? 'arrow-up' : 'arrow-down' }}" />
- </view>
- <view class="item" bindtap="changeTwo">
- <view class="name">绌洪棿鍚嶇О</view>
- <van-icon name="{{ showTwo ? 'arrow-up' : 'arrow-down' }}" />
+ <view data-index="{{index}}" wx:for="{{ secondCateList }}" class="item" bindtap="changeShowParams">
+ <view class="name">{{ item.paramName || item.labelName }}</view>
+ <van-icon name="{{ index == activeIndex ? 'arrow-up' : 'arrow-down' }}" />
</view>
</view>
- <view wx:if="{{ showOne }}" class="query_form">
+ <view wx:if="{{ activeParam.length > 0 }}" class="query_form">
<view class="list">
- <view class="item active">涓滆姖鐢佃</view>
- <view class="item">涓滆姖鍟婄殑鏃舵拻鐨勪唬鐢佃</view>
- <view class="item">涓滆姖鐢佃</view>
- <view class="item">涓滆姖鐢佃</view>
- <view class="item">涓滆姖鐢佃</view>
+ <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].paramIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
- <view class="btn" bindtap="changeOne">鍙栨秷</view>
- <view class="btn sub">纭</view>
- </view>
- </view>
- <view wx:if="{{ showTwo }}" class="query_form">
- <view class="list">
- <view class="item active">瀹滃</view>
- <view class="item">瀹滃</view>
- <view class="item">瀹滃</view>
- <view class="item">瀹滃</view>
- <view class="item">瀹滃</view>
- </view>
- <view class="btns">
- <view class="btn" bindtap="changeTwo">鍙栨秷</view>
- <view class="btn sub">纭</view>
+ <view class="btn" bindtap="cancelParam">鍙栨秷</view>
+ <view class="btn sub" bindtap="subParam">纭</view>
</view>
</view>
<view class="status">
@@ -57,7 +36,6 @@
<view class="item {{ sortType == 'LATEST' ? 'active' : '' }}" data-status="LATEST" bindtap="statusChange">鏈�鏂�</view>
</view>
<scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
- <!-- <view class="goods_list"> -->
<view wx:for="{{ datalist }}" data-id="{{item.id}}" class="item" bindtap="handleDetail">
<view class="img_wrap">
<image src="{{ item.coverImage }}" class="img" mode="widthFix"></image>
@@ -72,7 +50,6 @@
<text>{{ item.viewCount || 0 }}</text>
</view>
</view>
- <!-- </view> -->
</scroll-view>
</view>
</view>
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index 65c6fa3..01a09dd 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -138,13 +138,15 @@
}
.main_content .main_right .goods_list {
height: calc(100% - 182rpx);
+ width: 590rpx;
display: flex;
flex-wrap: wrap;
+ box-sizing: border-box;
justify-content: space-between;
padding: 12rpx 40rpx;
}
.main_content .main_right .goods_list .item {
- width: 50%;
+ width: 242rpx;
flex-shrink: 0;
margin-bottom: 32rpx;
}
diff --git a/wechat_jiaxuan/components/disRealpic/index.js b/wechat_jiaxuan/components/disRealpic/index.js
index 0d4116a..bf22744 100644
--- a/wechat_jiaxuan/components/disRealpic/index.js
+++ b/wechat_jiaxuan/components/disRealpic/index.js
@@ -123,6 +123,14 @@
const index = tagCodes.indexOf(code)
if(index === -1){
+ if(activeParam && activeParam.length > 0){
+ activeParam.forEach(item => {
+ const indexTemp = tagCodes.indexOf(item.labelValueCode)
+ if(indexTemp > -1){
+ tagCodes.splice(indexTemp, 1)
+ }
+ })
+ }
tagCodes.push(code)
cateList[activeIndex].paramIndex = paramIndex
cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
@@ -148,6 +156,7 @@
},
subParam() {
this.setData({ activeParam: [] })
+ this.setData({ pageNum: 1,dataList: [],total: 0})
this.getList()
},
changeShowParams(e){
diff --git a/wechat_jiaxuan/components/disRealpic/index.less b/wechat_jiaxuan/components/disRealpic/index.less
index 219773c..a168121 100644
--- a/wechat_jiaxuan/components/disRealpic/index.less
+++ b/wechat_jiaxuan/components/disRealpic/index.less
@@ -33,7 +33,7 @@
padding-top: 120rpx;
.query_wrap_scroll {
- width: 670rpx;
+ width: 750rpx;
padding: 0 40rpx;
}
@@ -133,13 +133,17 @@
.goods_list {
padding: 12rpx 40rpx;
height: calc( 100% - 188rpx);
+ box-sizing: border-box;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-around;
.item {
- width: 100%;
+ width: 324rpx;
margin-bottom: 32rpx;
.img_wrap {
width: 100%;
- height: 376rpx;
+ height: 182rpx;
border-radius: 8rpx;
overflow: hidden;
position: relative;
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxml b/wechat_jiaxuan/components/disRealpic/index.wxml
index c887463..98ef3e0 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxml
+++ b/wechat_jiaxuan/components/disRealpic/index.wxml
@@ -35,7 +35,7 @@
<view class="item {{ sortType == 'LATEST' ? 'active' : '' }}" data-status="LATEST" bindtap="statusChange">鏈�鏂�</view>
</view>
<!-- goods_list -->
- <scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
+ <scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
<view wx:for="{{ dataList }}" data-item="{{item}}" class="item" bindtap="handleDetail">
<view class="img_wrap">
<image src="{{ item.coverImage }}" class="img"></image>
@@ -48,13 +48,13 @@
</view>
<view class="content">
<view class="name">{{ item.title }}</view>
- <view class="info">
- <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 {{true ? 'primary' : ''}}">{{ item.collectCount }}</text>
- <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
- <text>{{ item.viewCount }}</text>
- </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>
+ <text>{{ item.viewCount }}</text>
</view>
</view>
</scroll-view>
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxss b/wechat_jiaxuan/components/disRealpic/index.wxss
index 808b1c8..613db32 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxss
+++ b/wechat_jiaxuan/components/disRealpic/index.wxss
@@ -31,7 +31,7 @@
padding-top: 120rpx;
}
.main_content .query_wrap_scroll {
- width: 670rpx;
+ width: 750rpx;
padding: 0 40rpx;
}
.main_content .query_wrap {
@@ -117,14 +117,18 @@
.main_content .goods_list {
padding: 12rpx 40rpx;
height: calc(100% - 188rpx);
+ box-sizing: border-box;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-around;
}
.main_content .goods_list .item {
- width: 100%;
+ width: 324rpx;
margin-bottom: 32rpx;
}
.main_content .goods_list .item .img_wrap {
width: 100%;
- height: 376rpx;
+ height: 182rpx;
border-radius: 8rpx;
overflow: hidden;
position: relative;
diff --git a/wechat_jiaxuan/pages/consult/consult.js b/wechat_jiaxuan/pages/consult/consult.js
index 4ea967a..5e74e3b 100644
--- a/wechat_jiaxuan/pages/consult/consult.js
+++ b/wechat_jiaxuan/pages/consult/consult.js
@@ -1,4 +1,4 @@
-import { getZhongTaiProductNewsPage, getCatalogList, getCataLogTagList } from '../../api/index'
+import { getZhongTaiProductNewsPage, getCatalogList,actionDo } from '../../api/index'
Page({
/**
@@ -57,6 +57,7 @@
},
itemClick(e) {
const item = e.currentTarget.dataset.item
+ actionDo({actionType: 'view',id: item.id})
if(item.contentType == 'link'){
wx.navigateTo({
url: '/pages/webView/index?link=' + item.content,
diff --git a/wechat_jiaxuan/pages/consult/detail.js b/wechat_jiaxuan/pages/consult/detail.js
index 31af89b..a1462ae 100644
--- a/wechat_jiaxuan/pages/consult/detail.js
+++ b/wechat_jiaxuan/pages/consult/detail.js
@@ -25,6 +25,9 @@
getDetail(id) {
getProductNewsInfo({ id }).then(res => {
this.setData({ info: res.data })
+ wx.setNavigationBarTitle({
+ title: res.data.title
+ })
})
},
openShare() {
diff --git a/wechat_jiaxuan/pages/consult/detail.json b/wechat_jiaxuan/pages/consult/detail.json
index eadfeb2..1405880 100644
--- a/wechat_jiaxuan/pages/consult/detail.json
+++ b/wechat_jiaxuan/pages/consult/detail.json
@@ -3,5 +3,5 @@
"van-popup": "@vant/weapp/popup/index",
"mp-html": "mp-html"
},
- "navigationBarTitleText": "璇︽儏"
+ "navigationBarTitleText": ""
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/design/design.js b/wechat_jiaxuan/pages/design/design.js
index 7ac7dd8..4e61074 100644
--- a/wechat_jiaxuan/pages/design/design.js
+++ b/wechat_jiaxuan/pages/design/design.js
@@ -59,6 +59,9 @@
wx.showToast({
title: '鎶ュ悕鎴愬姛'
})
+ wx.switchTab({
+ url: '/pages/index/index',
+ })
})
},
// 鏄剧ず鍩庡競寮圭獥
@@ -79,22 +82,27 @@
this.setData({ addr, showAreaList: false })
console.log('selectedOptions', addr);
},
- // 鍒囨崲鍩庡競
- // confirmChange(e) {
- // let {
- // values
- // } = e.detail
- // let region = []
- // for (let i in values) {
- // region.push(values[i].name)
- // }
- // this.setData({
- // region,
- // cityCode: values[1].code
- // })
- // this.getShopList()
- // this.chooseCity()
- // },
+ positionChange (e) {
+ console.log(e.detail.value)
+ const names = e.detail.value
+ const codes = e.detail.code
+ let addr = {
+ provinceCode: codes[0] + '00',
+ provinceName: names[0],
+ cityCode: codes[1] + '00',
+ cityName: names[1],
+ areaCode: codes[2] + '00',
+ areaName: names[2],
+ }
+ this.setData({ addr })
+ },
+ bindRegionChange(e) {
+ console.log('picker鍙戦�侀�夋嫨鏀瑰彉锛屾惡甯﹀�间负', e.detail.value)
+ const temp = e.detail.value
+ this.setData({
+ region: e.detail.value
+ })
+ },
onClose() {
this.setData({ showAreaList: false })
},
diff --git a/wechat_jiaxuan/pages/design/design.less b/wechat_jiaxuan/pages/design/design.less
index f9f0e9d..a4e63bc 100644
--- a/wechat_jiaxuan/pages/design/design.less
+++ b/wechat_jiaxuan/pages/design/design.less
@@ -35,7 +35,13 @@
border-radius: 8rpx;
padding: 0 32rpx;
margin-bottom: 40rpx;
-
+ .city_picler{
+ flex: 1;
+ padding-left: 30rpx;
+ .placeholder9{
+ color: #c8c9cc;
+ }
+ }
.icon {
width: 40rpx;
}
diff --git a/wechat_jiaxuan/pages/design/design.wxml b/wechat_jiaxuan/pages/design/design.wxml
index f6b125c..d7700a6 100644
--- a/wechat_jiaxuan/pages/design/design.wxml
+++ b/wechat_jiaxuan/pages/design/design.wxml
@@ -10,10 +10,14 @@
<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 }}" />
</view>
- <view class="line" bindtap="chooseCity">
+ <view class="line">
<image class="icon" src="../../static/icon/design_ic_city.png" mode="widthFix"></image>
- <view wx:if="{{addr.areaCode}}" class="city">{{addr.provinceName}}{{addr.cityName}}{{addr.areaName}}</view>
- <view wx:else class="placeholder9 city">璇烽�夋嫨鍦板尯</view>
+ <picker class="city_picler" mode="region" value="{{ addr }}" bindchange="bindRegionChange" bindchange="positionChange">
+ <view class="placeholder9" hidden="{{ addr.cityName }}">璇烽�夋嫨鍦板潃</view>
+ <view class="picker" hidden="{{ !addr.cityName }}">
+ {{ addr.provinceName }}{{ addr.cityName }}{{ addr.areaName }}
+ </view>
+ </picker>
<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 f347b2a..cb51faa 100644
--- a/wechat_jiaxuan/pages/design/design.wxss
+++ b/wechat_jiaxuan/pages/design/design.wxss
@@ -34,6 +34,13 @@
padding: 0 32rpx;
margin-bottom: 40rpx;
}
+.main_content .line .city_picler {
+ flex: 1;
+ padding-left: 30rpx;
+}
+.main_content .line .city_picler .placeholder9 {
+ color: #c8c9cc;
+}
.main_content .line .icon {
width: 40rpx;
}
diff --git a/wechat_jiaxuan/pages/detailDis/case.js b/wechat_jiaxuan/pages/detailDis/case.js
index 285aca7..09050e9 100644
--- a/wechat_jiaxuan/pages/detailDis/case.js
+++ b/wechat_jiaxuan/pages/detailDis/case.js
@@ -18,10 +18,10 @@
bottomLift: app.bottomLift
})
this.getDetail(options.id)
- // actionDo({
- // actionType: 'view',
- // id: options.id
- // })
+ actionDo({
+ actionType: 'view',
+ id: options.id
+ })
const member = wx.getStorageSync('member')
this.setData({id: options.id, member})
},
@@ -40,7 +40,7 @@
},
handleShare() {
console.log('鐐瑰嚮浜嗗垎浜�');
- shareContent(this.data.info.id)
+ actionDo({ actionType: 'share', id: this.data.info.id })
},
// onShareAppMessage: function () {
// // let { productDetail, userInfo } = this.data
@@ -56,8 +56,11 @@
actionType,
id: this.data.info.id
}).then(res => {
- info.isCollection = !info.isCollection
+ info.collection = !info.collection
this.setData({info})
+ wx.showToast({
+ title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
+ })
})
},
getDetail(id) {
diff --git a/wechat_jiaxuan/pages/detailDis/case.wxml b/wechat_jiaxuan/pages/detailDis/case.wxml
index acc81d4..7aa7378 100644
--- a/wechat_jiaxuan/pages/detailDis/case.wxml
+++ b/wechat_jiaxuan/pages/detailDis/case.wxml
@@ -25,8 +25,8 @@
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
<button class="item btn">
- <image data-code="like_cancel" bindtap="handleAction" wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
- <image wx:else data-code="like" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.collection }}" 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>
<button open-type="share" class="item btn" bindtap="handleShare">
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index 9f3398b..c62e89e 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -1,4 +1,8 @@
-import { shareContent, getProductInfo, actionDo } from '../../api/index'
+import {
+ shareContent,
+ getProductInfo,
+ actionDo
+} from '../../api/index'
Page({
/**
@@ -26,34 +30,54 @@
id: options.id
})
const member = wx.getStorageSync('member')
- this.setData({id: options.id, member})
+ this.setData({
+ id: options.id,
+ member
+ })
},
- handleAction(e){
+ handleAction(e) {
const actionType = e.currentTarget.dataset.code
- const { info } = this.data
+ const {
+ info
+ } = this.data
actionDo({
actionType,
id: this.data.info.id
}).then(res => {
- info.isCollection = !info.isCollection
- this.setData({info})
+ info.collection = !info.collection
+ this.setData({
+ info
+ })
+ wx.showToast({
+ title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
+ })
})
},
getDetail(id) {
- getProductInfo({id}).then(res => {
- this.setData({ info: res.data })
+ getProductInfo({
+ id
+ }).then(res => {
+ this.setData({
+ info: res.data
+ })
wx.setNavigationBarTitle({
title: res.data.title
- })
+ })
})
},
playVideo() {
wx.previewMedia({
- sources: [{ url: this.data.info.video, type: 'video' }]
+ sources: [{
+ url: this.data.info.video,
+ type: 'video'
+ }]
})
},
bannerbindload(e) {
- const { height, width } = e.detail
+ const {
+ height,
+ width
+ } = e.detail
let activeHeight = height * 670 / width
this.setData({
bannerHeight: activeHeight
@@ -65,11 +89,16 @@
})
},
openShare() {
- this.setData({showShare: true})
+ this.setData({
+ showShare: true
+ })
},
handleShare() {
console.log('鐐瑰嚮浜嗗垎浜�');
- actionDo({ actionType: 'share', id: this.data.info.id })
+ actionDo({
+ actionType: 'share',
+ id: this.data.info.id
+ })
// shareContent({id: this.data.info.id || this.data.id}).then(res => {
// this.setData({showShare: false})
// })
@@ -82,10 +111,14 @@
// }
// },
onClose() {
- this.setData({showShare: false})
+ this.setData({
+ showShare: false
+ })
},
handleDown() {
- let { info } = this.data
+ let {
+ info
+ } = this.data
wx.showToast({
title: '涓嬭浇涓�',
icon: 'loading'
@@ -93,7 +126,7 @@
console.log('info.picUrls', info)
wx.downloadFile({
url: info.picUrls,
- success (res) {
+ success(res) {
// console.log(res)
wx.saveImageToPhotosAlbum({
filePath: res.tempFilePath,
@@ -112,7 +145,7 @@
}
})
},
- fail (err) {
+ fail(err) {
console.log(err.errMsg)
wx.showToast({
title: '涓嬭浇澶辫触',
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index 94280fd..de0fb5a 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -51,8 +51,8 @@
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
<button class="item btn">
- <image data-code="like_cancel" bindtap="handleAction" wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
- <image wx:else data-code="like" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.collection }}" 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>
<button open-type="share" class="item btn" bindtap="handleShare">
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.js b/wechat_jiaxuan/pages/detailDis/realpic.js
index 9b973cb..9d56aa5 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.js
+++ b/wechat_jiaxuan/pages/detailDis/realpic.js
@@ -35,7 +35,10 @@
actionType,
id: this.data.info.id
}).then(res => {
- info.isCollection = !info.isCollection
+ info.collection = !info.collection
+ wx.showToast({
+ title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
+ })
this.setData({info})
})
},
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxml b/wechat_jiaxuan/pages/detailDis/realpic.wxml
index cd62bc6..12ca0ae 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.wxml
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxml
@@ -13,8 +13,8 @@
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
<button class="item btn">
- <image data-code="like_cancel" bindtap="handleAction" wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
- <image wx:else data-code="like" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.collection }}" 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>
<button open-type="share" class="item btn" bindtap="handleShare">
diff --git a/wechat_jiaxuan/pages/homeId/index.js b/wechat_jiaxuan/pages/homeId/index.js
index 19d5dd9..95ecff5 100644
--- a/wechat_jiaxuan/pages/homeId/index.js
+++ b/wechat_jiaxuan/pages/homeId/index.js
@@ -1,4 +1,4 @@
-import { getCataLogTagList, pageZSZXContentList } from '../../api/index'
+import { getCataLogTagList, pageZSZXContentList, actionDo } from '../../api/index'
Page({
/**
@@ -53,6 +53,7 @@
itemClick(e) {
const item = e.currentTarget.dataset.item
console.log('item', item);
+ actionDo({actionType: 'view',id: item.id})
if(item.contentType == 'video'){
wx.previewMedia({
sources: [{ url: item.content, type: 'video' }]
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index 3f490c3..3828fd4 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -4,7 +4,7 @@
getZSZXCatalogs,
getCustomizedNewsList,
getHomeBanner,
- getHomeBannerDetail,
+ actionDo,
getZhongTaiVideoPage,
getZhongTaiProductNewsPage
} from '../../api/index'
@@ -195,6 +195,7 @@
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' }]
diff --git a/wechat_jiaxuan/pages/index/index.less b/wechat_jiaxuan/pages/index/index.less
index b4f8a91..0e1ef18 100644
--- a/wechat_jiaxuan/pages/index/index.less
+++ b/wechat_jiaxuan/pages/index/index.less
@@ -176,15 +176,14 @@
.left {
font-weight: 600;
- font-size: 36rpx;
+ font-size: 34rpx;
color: #111111;
- line-height: 50rpx;
+ line-height: 34rpx;
flex: 1;
-
.name {
display: flex;
align-items: center;
-
+ margin-bottom: 10rpx;
.icon {
width: 36rpx;
height: 36rpx;
diff --git a/wechat_jiaxuan/pages/index/index.wxss b/wechat_jiaxuan/pages/index/index.wxss
index 3af4b13..783b089 100644
--- a/wechat_jiaxuan/pages/index/index.wxss
+++ b/wechat_jiaxuan/pages/index/index.wxss
@@ -144,14 +144,15 @@
}
.container .com_header .left {
font-weight: 600;
- font-size: 36rpx;
+ font-size: 34rpx;
color: #111111;
- line-height: 50rpx;
+ line-height: 34rpx;
flex: 1;
}
.container .com_header .left .name {
display: flex;
align-items: center;
+ margin-bottom: 10rpx;
}
.container .com_header .left .name .icon {
width: 36rpx;
diff --git a/wechat_jiaxuan/pages/mine/mine.less b/wechat_jiaxuan/pages/mine/mine.less
index 14717d3..d1854cb 100644
--- a/wechat_jiaxuan/pages/mine/mine.less
+++ b/wechat_jiaxuan/pages/mine/mine.less
@@ -59,6 +59,8 @@
}
.main_content{
background-color: #fff;
+ position: relative;
+ z-index: 9999;
border-radius: 16rpx 16rpx 0rpx 0rpx;
padding: 40rpx;
.func_list{
diff --git a/wechat_jiaxuan/pages/mine/mine.wxss b/wechat_jiaxuan/pages/mine/mine.wxss
index 681362e..4dd3a16 100644
--- a/wechat_jiaxuan/pages/mine/mine.wxss
+++ b/wechat_jiaxuan/pages/mine/mine.wxss
@@ -51,6 +51,8 @@
}
.container .main_content {
background-color: #fff;
+ position: relative;
+ z-index: 9999;
border-radius: 16rpx 16rpx 0rpx 0rpx;
padding: 40rpx;
}
diff --git a/wechat_jiaxuan/pages/userinfo/collect.js b/wechat_jiaxuan/pages/userinfo/collect.js
index d7ad2b8..2ff7453 100644
--- a/wechat_jiaxuan/pages/userinfo/collect.js
+++ b/wechat_jiaxuan/pages/userinfo/collect.js
@@ -67,7 +67,7 @@
}).then(res => {
if (res.data) {
this.setData({
- dataList: [...this.data.dataset, ...res.data.records || []],
+ dataList: [...this.data.dataList, ...res.data.records || []],
total: res.data.total
})
}
diff --git a/wechat_jiaxuan/pages/userinfo/collect.wxml b/wechat_jiaxuan/pages/userinfo/collect.wxml
index f9869e6..2193266 100644
--- a/wechat_jiaxuan/pages/userinfo/collect.wxml
+++ b/wechat_jiaxuan/pages/userinfo/collect.wxml
@@ -22,10 +22,10 @@
<view class="name">{{ item.displayName }}</view>
<view class="info">
<image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
- <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
- <text class="num {{true ? 'primary' : ''}}">34</text>
+ <image wx:else class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">{{ item.collectCount }}</text>
<image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
- <text>1000</text>
+ <text>{{ item.viewCount }}</text>
</view>
</view>
</view>
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.js b/wechat_jiaxuan/pages/userinfo/favorite.js
index 88fe16a..e5d8b73 100644
--- a/wechat_jiaxuan/pages/userinfo/favorite.js
+++ b/wechat_jiaxuan/pages/userinfo/favorite.js
@@ -67,7 +67,7 @@
}).then(res => {
if (res.data) {
this.setData({
- dataList: [...this.data.dataset, ...res.data.records || []],
+ dataList: [...this.data.dataList, ...res.data.records || []],
total: res.data.total
})
}
diff --git a/wechat_jiaxuan/pages/userinfo/index.less b/wechat_jiaxuan/pages/userinfo/index.less
index 61f36da..b5c2ab3 100644
--- a/wechat_jiaxuan/pages/userinfo/index.less
+++ b/wechat_jiaxuan/pages/userinfo/index.less
@@ -24,6 +24,17 @@
margin-bottom: 40rpx;
display: flex;
align-items: center;
+ .picker{
+ width: 100%;
+ display: flex;
+ .picker_wrap{
+ width: 528rpx;
+ display: flex;
+ }
+ .text{
+ flex: 1;
+ }
+ }
.label{
width: 110rpx;
font-size: 30rpx;
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxml b/wechat_jiaxuan/pages/userinfo/index.wxml
index d296143..f16d593 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxml
+++ b/wechat_jiaxuan/pages/userinfo/index.wxml
@@ -1,5 +1,5 @@
<view class="container">
- <image class="avatar" src="{{ imgurlFull ? imgurlFull : '../../static/images/default_avatar.png' }}" mode="widthFix"></image>
+ <image class="avatar" bindtap="selMedia" src="{{ imgurlFull ? imgurlFull : '../../static/images/default_avatar.png' }}"></image>
<view bindtap="selMedia" class="avatar_btn">鏇存崲澶村儚</view>
<view class="list">
<view class="line">
@@ -8,7 +8,7 @@
</view>
<view class="line">
<view class="label">濮撳悕</view>
- <van-field type="text" border="{{ false }}" class="input" model:value="{{ name }}" maxlength="{{ 18 }}" clearable />
+ <van-field type="text" border="{{ false }}" class="input" model:value="{{ name }}" maxlength="{{ 10 }}" clearable />
</view>
<view class="line">
<view class="label">鐢佃瘽</view>
@@ -17,15 +17,17 @@
<view class="line">
<view class="label">鍩庡競</view>
<view class="val">
- <view class="df_ac">
- <picker mode="region" value="{{ addr }}" bindchange="bindRegionChange" bindchange="positionChange">
- <view class="placeholder9" hidden="{{ addr.cityName }}">璇烽�夋嫨鍦板潃</view>
- <view class="picker" hidden="{{ !addr.cityName }}">
- {{ addr.provinceName }}{{ addr.cityName }}{{ addr.areaName }}
+ <view class="df_ac" style="width: 100%">
+ <picker class="picker" mode="region" value="{{ addr }}" bindchange="bindRegionChange" bindchange="positionChange">
+ <view class="picker_wrap">
+ <view class="text placeholder9" hidden="{{ addr.cityName }}">璇烽�夋嫨鍦板潃</view>
+ <view class="text" hidden="{{ !addr.cityName }}">
+ {{ addr.provinceName }}{{ addr.cityName }}{{ addr.areaName }}
+ </view>
+ <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
</view>
</picker>
</view>
- <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
</view>
</view>
<view class="line">
@@ -41,8 +43,8 @@
</view>
<view class="line">
<view class="label">闈㈢Н</view>
- <van-field type="text" border="{{ false }}" class="input" model:value="{{ housearea }}" maxlength="{{ 15 }}" clearable />
- <!-- <text>m虏</text> -->
+ <van-field type="number" border="{{ false }}" class="input" model:value="{{ housearea }}" maxlength="{{ 30 }}" clearable />
+ <text>m虏</text>
</view>
<view class="line">
<view class="label">鎴峰瀷</view>
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxss b/wechat_jiaxuan/pages/userinfo/index.wxss
index 1c217ee..964c77e 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxss
+++ b/wechat_jiaxuan/pages/userinfo/index.wxss
@@ -26,6 +26,17 @@
display: flex;
align-items: center;
}
+.list .line .picker {
+ width: 100%;
+ display: flex;
+}
+.list .line .picker .picker_wrap {
+ width: 528rpx;
+ display: flex;
+}
+.list .line .picker .text {
+ flex: 1;
+}
.list .line .label {
width: 110rpx;
font-size: 30rpx;
diff --git a/wechat_jiaxuan/pages/userinfo/mysub.wxml b/wechat_jiaxuan/pages/userinfo/mysub.wxml
index 9f9f1bd..e8120b7 100644
--- a/wechat_jiaxuan/pages/userinfo/mysub.wxml
+++ b/wechat_jiaxuan/pages/userinfo/mysub.wxml
@@ -44,11 +44,11 @@
</view>
<view class="line">
<view class="label">鎴垮眿闈㈢Н</view>
- <view class="val">{{ item.area }}</view>
+ <view class="val">{{ item.area }} m虏</view>
</view>
<view class="line">
- <view class="label">{{ item.budget }}</view>
- <view class="val">鐢�</view>
+ <view class="label">瑁呬慨棰勭畻</view>
+ <view class="val">{{ item.budget }}涓囧厓</view>
</view>
</block>
<view class="time">
diff --git a/wechat_jiaxuan/utils/request.js b/wechat_jiaxuan/utils/request.js
index 25c32db..fbd20fd 100644
--- a/wechat_jiaxuan/utils/request.js
+++ b/wechat_jiaxuan/utils/request.js
@@ -36,6 +36,9 @@
}).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)
diff --git a/wechat_staff/api/index.js b/wechat_staff/api/index.js
index 0a9f095..28e7a7d 100644
--- a/wechat_staff/api/index.js
+++ b/wechat_staff/api/index.js
@@ -182,3 +182,10 @@
data
})
}
+// 灏忕▼搴忔敞閿�
+export const getCrmAuthUrl = (data) => {
+ return request({
+ url: '/web/customer/getCrmAuthUrl',
+ data
+ })
+}
diff --git a/wechat_staff/pages/client/index.js b/wechat_staff/pages/client/index.js
index b2b175d..340e25e 100644
--- a/wechat_staff/pages/client/index.js
+++ b/wechat_staff/pages/client/index.js
@@ -1,20 +1,26 @@
// pages/client/index.js
-Page({
+import { getCrmAuthUrl, getDictData } from '../../api/index'
+Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
-
- },
-
+ url:''
+ },
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
- onLoad(options) {
-
+ onLoad(options) {
+ this.loadData()
},
-
+ loadData(){
+ wx.showToast()
+ getCrmAuthUrl({type:0}).then(res => {
+ console.log(res.data)
+ this.setData({ url: res.data })
+ })
+ },
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
@@ -25,8 +31,10 @@
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
- onShow() {
-
+ onShow() {
+ // if(this.data.url ==null || this.data.url ==''){
+ // this.loadData()
+ // }
},
/**
diff --git a/wechat_staff/pages/client/index.wxml b/wechat_staff/pages/client/index.wxml
index dec2201..ce2e854 100644
--- a/wechat_staff/pages/client/index.wxml
+++ b/wechat_staff/pages/client/index.wxml
@@ -1,2 +1,3 @@
<!--pages/client/index.wxml-->
-<text>pages/client/index.wxml</text>
+<web-view wx:if="{{url !=null && url !=''}}" src="{{url}}"> </web-view>
+<button wx:else style="margin-top: 50%;width: 200rpx;font-size: 14px;" bind:tap="loadData">閲嶆柊鍔犺浇</button>
diff --git a/wechat_staff/pages/sets/protocol.js b/wechat_staff/pages/sets/protocol.js
index 0c310a4..80fd810 100644
--- a/wechat_staff/pages/sets/protocol.js
+++ b/wechat_staff/pages/sets/protocol.js
@@ -15,9 +15,9 @@
onLoad(options) {
console.log(options.type)
if(options.type == 1){
- wx.setNavigationBarTitle({title:'闅愮鍗忚'})
+ wx.setNavigationBarTitle({title:'鐢ㄦ埛闅愮鍗忚'})
}else{
- wx.setNavigationBarTitle({title:'鐢ㄦ埛鍗忚'})
+ wx.setNavigationBarTitle({title:'鐢ㄦ埛鏈嶅姟鍗忚'})
}
this.loadDict(options.type);
},
diff --git a/wechat_staff/pages/store/staff.wxml b/wechat_staff/pages/store/staff.wxml
index 33b4a62..522ef83 100644
--- a/wechat_staff/pages/store/staff.wxml
+++ b/wechat_staff/pages/store/staff.wxml
@@ -75,4 +75,4 @@
<button class="btn2" bind:tap="saveCard">淇濇寔鍒扮浉鍐�</button>
</view>
</van-popup>
-</view>
\ No newline at end of file
+</view>prod
\ No newline at end of file
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index a6b251c..b472416 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,11 +1,8 @@
-
-
// export const baseUrl = 'https://jiaxuan.zbom.com/jx/wechat/' //姝ｅ紡鏈嶅姟鍣�
-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/'
-
+// export const baseUrl = 'https://dmtest.ahapp.net/web_interface/' // 娴嬭瘯鏈�
+export const baseUrl = 'http://192.168.0.135:10027' // 鏈湴
+
// 鑵捐鍦板浘寮�鍙戣�� key
export const qqMapKey = 'HIDBZ-2QXL4-TAWUD-XET6Q-EKTJE-CCBSQ'
--
Gitblit v1.9.3