From 2faa6546a9f9ddb29f81cbc9770fc25b95703695 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 17:02:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/userinfo/mysub.js | 16
wechat_staff/pages/login/index.wxml | 8
wechat_jiaxuan/pages/userinfo/collect.less | 1
wechat_jiaxuan/components/disProduct/index.less | 10
wechat_staff/pages/sets/index.less | 20 +
wechat_jiaxuan/pages/auth/auth.less | 34 ++
wechat_jiaxuan/pages/auth/auth.wxss | 34 ++
wechat_jiaxuan/pages/store/store.wxml | 8
wechat_jiaxuan/pages/webView/index.js | 1
wechat_jiaxuan/pages/calculator/index.js | 164 +++++++---
wechat_jiaxuan/pages/userinfo/favorite.wxml | 3
wechat_staff/pages/login/index.less | 34 ++
wechat_jiaxuan/pages/mine/mine.less | 1
wechat_staff/pages/sets/index.wxss | 19 +
wechat_staff/components/disRealpic/index.less | 2
wechat_jiaxuan/pages/index/index.less | 1
wechat_jiaxuan/components/disCase/index.wxss | 10
wechat_jiaxuan/pages/userinfo/index.less | 1
wechat_staff/components/disProduct/index.js | 5
wechat_staff/components/disCase/index.less | 1
wechat_jiaxuan/pages/calculator/index.wxss | 3
wechat_staff/components/disProduct/index.wxss | 2
wechat_jiaxuan/components/disCase/index.less | 10
wechat_jiaxuan/components/disRealpic/index.wxml | 5
wechat_jiaxuan/pages/sets/index.js | 6
wechat_jiaxuan/pages/store/info.wxml | 8
wechat_jiaxuan/pages/index/index.wxss | 1
wechat_jiaxuan/pages/mine/mine.wxss | 1
wechat_jiaxuan/pages/store/staff.js | 4
wechat_jiaxuan/pages/userinfo/collect.wxss | 1
wechat_jiaxuan/components/disProduct/index.wxml | 5
wechat_staff/components/disRealpic/index.wxss | 2
wechat_jiaxuan/pages/userinfo/index.wxss | 1
wechat_staff/components/disRealpic/index.js | 4
wechat_jiaxuan/pages/consult/consult.wxml | 3
wechat_jiaxuan/components/disProduct/index.js | 61 ++--
wechat_staff/pages/login/index.wxss | 38 ++
wechat_jiaxuan/pages/store/info.js | 51 ++-
wechat_jiaxuan/pages/store/info.less | 11
wechat_jiaxuan/pages/userinfo/favorite.less | 1
wechat_jiaxuan/components/disRealpic/index.less | 10
wechat_jiaxuan/app.wxss | 12
wechat_jiaxuan/pages/store/store.less | 13
wechat_staff/components/disCase/index.wxss | 1
wechat_jiaxuan/pages/auth/auth.wxml | 8
wechat_staff/components/disProduct/index.less | 1
wechat_jiaxuan/pages/consult/consult.js | 2
wechat_jiaxuan/pages/store/staff.wxml | 2
wechat_jiaxuan/pages/userinfo/favorite.wxss | 1
wechat_jiaxuan/pages/store/store.wxss | 11
wechat_staff/pages/login/index.js | 8
wechat_staff/pages/sets/index.js | 44 +-
wechat_jiaxuan/pages/auth/auth.js | 10
wechat_staff/utils/config.js | 4
wechat_jiaxuan/components/disCase/index.js | 68 ++--
wechat_jiaxuan/pages/homeId/index.wxml | 3
wechat_jiaxuan/pages/productVideo/index.wxml | 3
wechat_jiaxuan/components/disCase/index.wxml | 5
wechat_jiaxuan/pages/webView/index.wxml | 2
wechat_staff/components/disCase/index.js | 5
/dev/null | 0
wechat_jiaxuan/components/disRealpic/index.js | 4
wechat_jiaxuan/pages/calculator/index.wxml | 8
wechat_jiaxuan/components/disRealpic/index.wxss | 10
wechat_jiaxuan/pages/userinfo/mysub.wxml | 5
wechat_jiaxuan/components/disProduct/index.wxss | 10
wechat_jiaxuan/pages/userinfo/collect.wxml | 8
wechat_jiaxuan/pages/store/info.wxss | 13
68 files changed, 639 insertions(+), 223 deletions(-)
diff --git a/wechat_jiaxuan/app.wxss b/wechat_jiaxuan/app.wxss
index 5e9a5f0..3c7999d 100644
--- a/wechat_jiaxuan/app.wxss
+++ b/wechat_jiaxuan/app.wxss
@@ -31,6 +31,18 @@
.arrow_right{
width: 16rpx;
}
+.empty_wrap{
+ width: 100%;
+ height: 100%;
+ padding-top: 300rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.default_empty{
+ width: 300rpx;
+ height: 300rpx;
+}
/* */
.flex {
diff --git a/wechat_jiaxuan/components/disCase/index.js b/wechat_jiaxuan/components/disCase/index.js
index ac0a0ea..0c52299 100644
--- a/wechat_jiaxuan/components/disCase/index.js
+++ b/wechat_jiaxuan/components/disCase/index.js
@@ -26,12 +26,12 @@
this.getCatelist()
},
methods: {
- getCatelist(){
+ getCatelist() {
const { catalogCode } = this.data
getCataLogTagList({
catalogCode
}).then(res => {
- if(res.data && res.data.length > 0){
+ if (res.data && res.data.length > 0) {
this.setData({
cateList: res.data
})
@@ -42,29 +42,25 @@
})
},
getList() {
- const { sortType, query, tagCodes, pageNum, pageSize,catalogCode } = this.data
+ const { sortType, query, tagCodes, pageNum, pageSize, catalogCode } = this.data
getZhongTaiWholecasePage({
- catalogCode,pageNum,pageSize,tagCodes, sortType,query
+ catalogCode, pageNum, pageSize, tagCodes, sortType, query
}).then(res => {
- if(res.data){
- this.setData({
+ if (res.data) {
+ this.setData({
total: res.data.total,
dataList: [...this.data.dataList, ...res.data.records],
})
- }
+ }
})
},
- scrolltoupper() {
- this.setData({ pageNum: 1,datalist: [],total: 0})
- this.getList()
- },
scrolltolower() {
- console.log('瑙﹀簳浜嬩欢');
+ console.log('瑙﹀簳浜嬩欢')
const { total, dataList, pageNum } = this.data
- if(total > dataList.length){
+ if (total > dataList.length) {
this.setData({ pageNum: pageNum + 1 })
this.getList()
- }else{
+ } else {
wx.showToast({
title: '鏆傛棤鏇村鏁版嵁',
icon: 'none'
@@ -73,11 +69,11 @@
},
statusChange(e) {
const sortType = e.currentTarget.dataset.status
- this.setData({sortType})
- this.setData({ pageNum: 1,dataList: [],total: 0})
+ this.setData({ sortType })
+ this.setData({ pageNum: 1, dataList: [], total: 0 })
this.getList()
},
- handleAction(e){
+ handleAction(e) {
const actionType = e.currentTarget.dataset.code
const id = e.currentTarget.dataset.id
actionDo({
@@ -98,13 +94,13 @@
const paramIndex = e.currentTarget.dataset.index
const { cateList, tagCodes, activeParam, activeIndex } = this.data
const index = tagCodes.indexOf(code)
-
- if(index === -1){
+
+ if (index === -1) {
// 鍚宲aram閲宑ode閲嶅
- if(activeParam && activeParam.length > 0){
+ if (activeParam && activeParam.length > 0) {
activeParam.forEach(item => {
const indexTemp = tagCodes.indexOf(item.labelValueCode)
- if(indexTemp > -1){
+ if (indexTemp > -1) {
tagCodes.splice(indexTemp, 1)
}
})
@@ -112,50 +108,50 @@
tagCodes.push(code)
cateList[activeIndex].paramIndex = paramIndex
cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
- }else{
+ } else {
tagCodes.splice(index, 1)
cateList[activeIndex].paramIndex = -1
cateList[activeIndex].paramName = ''
}
- this.setData({ pageNum: 1,dataList: [],total: 0})
+ this.setData({ pageNum: 1, dataList: [], total: 0 })
this.setData({ tagCodes, cateList })
- console.log('tagCodes', tagCodes);
+ console.log('tagCodes', tagCodes)
},
cancelParam() {
const { cateList } = this.data
cateList.forEach(item => {
item.paramIndex = -1
- item.paramName = ''
+ item.paramName = item.paramName || ''
})
- this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
+ this.setData({ tagCodes: [], activeParam: [], cateList, activeIndex: -1 })
},
bindblur() {
- this.setData({ pageNum: 1,dataList: [],total: 0})
+ this.setData({ pageNum: 1, dataList: [], total: 0 })
this.getList()
},
subParam() {
this.setData({ activeParam: [] })
- this.setData({ pageNum: 1,dataList: [],total: 0})
+ this.setData({ pageNum: 1, activeIndex: -1, dataList: [], total: 0 })
this.getList()
},
- changeShowParams(e){
+ changeShowParams(e) {
const { cateList } = this.data
const activeIndex = e.currentTarget.dataset.index
- if(activeIndex === this.data.activeIndex){
+ if (activeIndex === this.data.activeIndex) {
this.setData({ activeIndex: -1, activeParam: [], selParam: '' })
- }else{
- this.setData({
+ } else {
+ this.setData({
activeIndex,
activeParam: cateList[activeIndex].valueVos
})
}
-
+
// this.setData({showTwo: false})
},
- changeTwo(){
+ changeTwo() {
const showTwo = !this.data.showTwo
- this.setData({showTwo})
- this.setData({showOne: false})
+ this.setData({ showTwo })
+ this.setData({ showOne: false })
},
}
})
diff --git a/wechat_jiaxuan/components/disCase/index.less b/wechat_jiaxuan/components/disCase/index.less
index cc252e7..424ef72 100644
--- a/wechat_jiaxuan/components/disCase/index.less
+++ b/wechat_jiaxuan/components/disCase/index.less
@@ -182,4 +182,14 @@
}
}
}
+}
+.empty_wrap{
+ width: 100%;
+ display: flex;
+ padding-top: 200rpx;
+ justify-content: center;
+}
+.default_empty{
+ width: 300rpx;
+ height: 300rpx;
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/disCase/index.wxml b/wechat_jiaxuan/components/disCase/index.wxml
index a8c7ddc..8a18d4a 100644
--- a/wechat_jiaxuan/components/disCase/index.wxml
+++ b/wechat_jiaxuan/components/disCase/index.wxml
@@ -35,7 +35,7 @@
<view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
<!-- goods_list -->
- <scroll-view bindscrolltoupper="scrolltoupper" 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-id="{{ item.id }}" class="item" bindtap="handleDetail">
<view class="img_wrap">
<image src="{{ item.coverImage }}" class="img"></image>
@@ -52,6 +52,9 @@
</view>
</view>
</view>
+ <view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</scroll-view>
</view>
</view>
diff --git a/wechat_jiaxuan/components/disCase/index.wxss b/wechat_jiaxuan/components/disCase/index.wxss
index 2d95d32..e9703ef 100644
--- a/wechat_jiaxuan/components/disCase/index.wxss
+++ b/wechat_jiaxuan/components/disCase/index.wxss
@@ -179,3 +179,13 @@
.main_content .goods_list .item .info .primary {
color: var(--themeColor);
}
+.empty_wrap {
+ width: 100%;
+ display: flex;
+ padding-top: 200rpx;
+ justify-content: center;
+}
+.default_empty {
+ width: 300rpx;
+ height: 300rpx;
+}
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index 6a8d494..ae5777e 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -1,4 +1,4 @@
-import { getCatalogList,getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
+import { getCatalogList, getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -28,21 +28,20 @@
attached() {
this.getCatelist()
var app = getApp()
- console.log('globalData', app.globalData);
- if(app.globalData.catalogCode){
+ if (app.globalData.catalogCode) {
this.setData({ catalogCode: app.globalData.catalogCode })
setTimeout(() => {
- console.log('catalogCode', this.data.catalogCode);
+ console.log('catalogCode', this.data.catalogCode)
getApp().globalData.catalogCode = ''
}, 2000)
}
},
methods: {
- getCatelist(){
+ getCatelist() {
getCatalogList({
catalogCode: 'product_intro'
}).then(res => {
- if(res.data && res.data.length > 0){
+ if (res.data && res.data.length > 0) {
this.setData({
catalogCode: this.data.catalogCode || res.data[0].code,
cateList: res.data
@@ -66,13 +65,13 @@
})
},
bindblur() {
- this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.setData({ pageNum: 1, datalist: [], total: 0 })
this.getList()
},
getList() {
- const { catalogCode,tagCodes, pageNum, pageSize, sortType, query } = this.data
+ const { catalogCode, tagCodes, pageNum, pageSize, sortType, query } = this.data
getZhongTaiProductPage({
- catalogCode,pageNum,pageSize,sortType,query,tagCodes
+ catalogCode, pageNum, pageSize, sortType, query, tagCodes
}).then(res => {
this.setData({
datalist: [...this.data.datalist, ...res.data.records],
@@ -81,12 +80,12 @@
})
},
scrolltolower() {
- console.log('瑙﹀簳浜嬩欢');
+ console.log('瑙﹀簳浜嬩欢')
const { total, datalist, pageNum } = this.data
- if(total > datalist.length){
+ if (total > datalist.length) {
this.setData({ pageNum: pageNum + 1 })
this.getList()
- }else{
+ } else {
wx.showToast({
title: '鏆傛棤鏇村鏁版嵁',
icon: 'none'
@@ -94,20 +93,20 @@
}
},
scrolltoupper() {
- this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.setData({ pageNum: 1, datalist: [], total: 0 })
this.getList()
},
cateClick(e) {
const catalogCode = e.currentTarget.dataset.code
this.setData({ catalogCode, tagCodes: [] })
- this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.setData({ pageNum: 1, datalist: [], total: 0 })
this.getTag()
this.getList()
},
statusChange(e) {
const sortType = e.currentTarget.dataset.status
- this.setData({sortType})
- this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.setData({ sortType })
+ this.setData({ pageNum: 1, datalist: [], total: 0 })
this.getList()
},
handleDetail(e) {
@@ -121,14 +120,14 @@
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){
+ console.log('code', code)
+ console.log('tagCodes', tagCodes)
+ if (index === -1) {
// 鍚宲aram閲宑ode閲嶅
- if(activeParam && activeParam.length > 0){
+ if (activeParam && activeParam.length > 0) {
activeParam.forEach(item => {
const indexTemp = tagCodes.indexOf(item.labelValueCode)
- if(indexTemp > -1){
+ if (indexTemp > -1) {
tagCodes.splice(indexTemp, 1)
}
})
@@ -136,22 +135,22 @@
tagCodes.push(code)
secondCateList[activeIndex].paramIndex = paramIndex
secondCateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
- }else{
+ } else {
tagCodes.splice(index, 1)
secondCateList[activeIndex].paramIndex = -1
secondCateList[activeIndex].paramName = ''
}
this.setData({ tagCodes, secondCateList })
},
- changeShowParams(e){
+ 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){
+ console.log('activeIndex', activeIndex)
+ console.log('secondCateList', secondCateList)
+ if (activeIndex === this.data.activeIndex) {
this.setData({ activeIndex: -1, activeParam: [] })
- }else{
- this.setData({
+ } else {
+ this.setData({
activeIndex,
activeParam: secondCateList[activeIndex].valueVos
})
@@ -162,13 +161,13 @@
const { secondCateList } = this.data
secondCateList.forEach(item => {
item.paramIndex = -1
- item.paramName = ''
+ item.paramName = item.paramName || ''
})
- this.setData({ tagCodes: [],activeParam: [],secondCateList,activeIndex: -1 })
+ this.setData({ tagCodes: [], activeParam: [], secondCateList, activeIndex: -1 })
},
subParam() {
this.setData({ activeParam: [] })
- this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.setData({ pageNum: 1, activeIndex: -1, datalist: [], total: 0 })
this.getList()
},
}
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index e945273..e7bd521 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -227,4 +227,14 @@
}
}
}
+}
+.empty_wrap{
+ width: 100%;
+ display: flex;
+ padding-top: 200rpx;
+ justify-content: center;
+}
+.default_empty{
+ width: 300rpx;
+ height: 300rpx;
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index 4b9fa34..09c2d56 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -36,7 +36,7 @@
<view class="separate"></view>
<view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
- <scroll-view bindscrolltoupper="scrolltoupper" 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-id="{{item.id}}" class="item" bindtap="handleDetail">
<view class="img_wrap">
<image src="{{ item.coverImage }}" class="img" mode="aspectFit"></image>
@@ -51,6 +51,9 @@
<text>{{ item.viewCount || 0 }}</text>
</view>
</view>
+ <view wx:if="{{ datalist.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</scroll-view>
</view>
</view>
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index b5288b8..c937e3c 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -203,3 +203,13 @@
.main_content .main_right .goods_list .item .info .primary {
color: var(--themeColor);
}
+.empty_wrap {
+ width: 100%;
+ display: flex;
+ padding-top: 200rpx;
+ justify-content: center;
+}
+.default_empty {
+ width: 300rpx;
+ height: 300rpx;
+}
diff --git a/wechat_jiaxuan/components/disRealpic/index.js b/wechat_jiaxuan/components/disRealpic/index.js
index 0aea630..95e7e49 100644
--- a/wechat_jiaxuan/components/disRealpic/index.js
+++ b/wechat_jiaxuan/components/disRealpic/index.js
@@ -151,7 +151,7 @@
const { cateList } = this.data
cateList.forEach(item => {
item.paramIndex = -1
- item.paramName = ''
+ item.paramName = item.paramName || ''
})
this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
},
@@ -161,7 +161,7 @@
},
subParam() {
this.setData({ activeParam: [] })
- this.setData({ pageNum: 1,dataList: [],total: 0})
+ this.setData({ pageNum: 1,activeIndex: -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 d4c71ea..c1c3d04 100644
--- a/wechat_jiaxuan/components/disRealpic/index.less
+++ b/wechat_jiaxuan/components/disRealpic/index.less
@@ -235,4 +235,14 @@
}
}
}
+}
+.empty_wrap{
+ width: 100%;
+ display: flex;
+ padding-top: 200rpx;
+ justify-content: center;
+}
+.default_empty{
+ width: 300rpx;
+ height: 300rpx;
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxml b/wechat_jiaxuan/components/disRealpic/index.wxml
index c358027..4842835 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxml
+++ b/wechat_jiaxuan/components/disRealpic/index.wxml
@@ -36,7 +36,7 @@
<view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
<!-- goods_list -->
- <scroll-view bindscrolltoupper="scrolltoupper" 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>
@@ -58,6 +58,9 @@
<text>{{ item.viewCount }}</text>
</view>
</view>
+ <view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</scroll-view>
</view>
</view>
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxss b/wechat_jiaxuan/components/disRealpic/index.wxss
index 298d780..c6fd469 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxss
+++ b/wechat_jiaxuan/components/disRealpic/index.wxss
@@ -208,3 +208,13 @@
.main_content .goods_list .item .info .primary {
color: var(--themeColor);
}
+.empty_wrap {
+ width: 100%;
+ display: flex;
+ padding-top: 200rpx;
+ justify-content: center;
+}
+.default_empty {
+ width: 300rpx;
+ height: 300rpx;
+}
diff --git a/wechat_jiaxuan/pages/auth/auth.js b/wechat_jiaxuan/pages/auth/auth.js
index 7c47de8..e15e1e1 100644
--- a/wechat_jiaxuan/pages/auth/auth.js
+++ b/wechat_jiaxuan/pages/auth/auth.js
@@ -10,6 +10,7 @@
data: {
agreementFalg: false,
primary: '',
+ bottomLift: 0,
showModal: false,
serviceHtml: '',
@@ -18,6 +19,10 @@
activeHtml: ''
},
initData(){
+ var app = getApp().globalData
+ this.setData({
+ bottomLift: app.bottomLift
+ })
getDictData({
code: 'ZBOM_CUSTOMIZED',
label: 'SERVER_AGREEMENT'
@@ -35,6 +40,11 @@
})
})
},
+ handleJudge(e) {
+ const flag = e.currentTarget.dataset.flag
+ console.log(e);
+ this.setData({ agreementFalg: flag, showModal: false })
+ },
loginIn() {
const { agreementFalg } = this.data
if(!agreementFalg) return wx.showToast({
diff --git a/wechat_jiaxuan/pages/auth/auth.less b/wechat_jiaxuan/pages/auth/auth.less
index b2da8d2..d7e8f3e 100644
--- a/wechat_jiaxuan/pages/auth/auth.less
+++ b/wechat_jiaxuan/pages/auth/auth.less
@@ -38,9 +38,39 @@
}
.modal{
width: 100%;
- max-height: 1120rpx;
- min-height: 600rpx;
+ height: calc( 100vh - 200rpx );
padding: 40rpx;
+ position: relative;
+ .content{
+ height: calc( 100vh - 460rpx );
+ overflow: auto;
+ margin-bottom: 20rpx;
+ }
+ .btns{
+ position: fixed;
+ padding: 20rpx 0rpx;
+ width: 100%;
+ z-index: 999;
+ border-top: 1px solid #e5e5e5;
+ .btn{
+ width: 670rpx;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #999999;
+ text-align: center;
+ margin-top: 30rpx;
+ }
+ .agree{
+ width: 670rpx;
+ height: 88rpx;
+ background: #B08771;
+ border-radius: 8rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #fff;
+ }
+ }
}
.title{
font-weight: 600;
diff --git a/wechat_jiaxuan/pages/auth/auth.wxml b/wechat_jiaxuan/pages/auth/auth.wxml
index 5d23db3..433c859 100644
--- a/wechat_jiaxuan/pages/auth/auth.wxml
+++ b/wechat_jiaxuan/pages/auth/auth.wxml
@@ -23,7 +23,13 @@
<!-- -->
<van-popup position="bottom" show="{{ showModal }}" round bind:close="onClose">
<view class="modal">
- <mp-html content="{{activeHtml}}"></mp-html>
+ <view class="content">
+ <mp-html content="{{activeHtml}}"></mp-html>
+ </view>
+ <view style="bottom: {{ bottomLift }}px" class="btns">
+ <view data-flag="{{true}}" bindtap="handleJudge" class="agree">鍚屾剰</view>
+ <view data-flag="{{false}}" bindtap="handleJudge" class="btn">涓嶅悓鎰忓苟閫�鍑�</view>
+ </view>
</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 fb2824a..5b3e3d2 100644
--- a/wechat_jiaxuan/pages/auth/auth.wxss
+++ b/wechat_jiaxuan/pages/auth/auth.wxss
@@ -38,9 +38,39 @@
}
.modal {
width: 100%;
- max-height: 1120rpx;
- min-height: 600rpx;
+ height: calc(100vh - 200rpx);
padding: 40rpx;
+ position: relative;
+}
+.modal .content {
+ height: calc(100vh - 460rpx);
+ overflow: auto;
+ margin-bottom: 20rpx;
+}
+.modal .btns {
+ position: fixed;
+ padding: 20rpx 0rpx;
+ width: 100%;
+ z-index: 999;
+ border-top: 1px solid #e5e5e5;
+}
+.modal .btns .btn {
+ width: 670rpx;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #999999;
+ text-align: center;
+ margin-top: 30rpx;
+}
+.modal .btns .agree {
+ width: 670rpx;
+ height: 88rpx;
+ background: #B08771;
+ border-radius: 8rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #fff;
}
.title {
font-weight: 600;
diff --git a/wechat_jiaxuan/pages/calculator/index.js b/wechat_jiaxuan/pages/calculator/index.js
index cb7f226..fc17e17 100644
--- a/wechat_jiaxuan/pages/calculator/index.js
+++ b/wechat_jiaxuan/pages/calculator/index.js
@@ -1,7 +1,13 @@
// pages/calculator/index.js
// import { imageUrl } from '../../utils/config'
// import { calculatorOption, calculatorSave, decodePhone, bindPhone } from '../../api/index'
-import { getBjParamConfig, saveRenovationCalculator, getDictData, getWxMiniPhone, binDingPhone } from '../../api/index'
+import {
+ getBjParamConfig,
+ saveRenovationCalculator,
+ getDictData,
+ getWxMiniPhone,
+ binDingPhone
+} from '../../api/index'
// import Ls from '../../utils/storage'
// let ls = new Ls
Page({
@@ -36,31 +42,41 @@
this.getCalculatorOption()
const userInfo = wx.getStorageSync('member')
if (userInfo.phone) {
- that.setData({ userPhone: userInfo.phone })
+ that.setData({
+ userPhone: userInfo.phone
+ })
}
},
- navigateBack () {
+ navigateBack() {
wx.navigateBack({
delta: 1,
})
},
// picker 閫夋嫨
- onChange (e) {
- this.setData({ pickerIndex: e.detail.index })
+ onChange(e) {
+ this.setData({
+ pickerIndex: e.detail.index
+ })
},
// input 杈撳叆
- inputTyping (e) {
- this.setData({ [e.currentTarget.dataset.index]: e.detail.value })
+ inputTyping(e) {
+ this.setData({
+ [e.currentTarget.dataset.index]: e.detail.value
+ })
},
// 閫夋嫨鎴垮眿绫诲瀷銆佹埛鍨嬩俊鎭�
- toSelectType (e) {
+ toSelectType(e) {
let index = e.currentTarget.dataset.index
- let { activePicker } = this.data
- if ( activePicker === index) {
- this.setData({ showPopup: true })
+ let {
+ activePicker
+ } = this.data
+ if (activePicker === index) {
+ this.setData({
+ showPopup: true
+ })
} else {
this.setData({
pickerIndex: 0,
@@ -71,45 +87,71 @@
},
// 鍙栨秷閫夋嫨
- cancelPicker () {
- this.setData({ showPopup: false })
- },
-
- // 纭閫夋嫨
- confirmPicker () {
- let { activePicker, pickerIndex } = this.data
- this.setData({ [activePicker]: pickerIndex, showPopup: false })
- },
-
- // 鑾峰彇鐢ㄦ埛鎵嬫満鍙�
- getPhoneNumber (e) {
- const data = { ...e.detail }
- getWxMiniPhone({
- encryptedData: data.encryptedData,
- iv: data.iv,
- sessionKey: wx.getStorageSync('sessionKey') || data.iv,
- }).then(res => {
- binDingPhone({
- phone: res.data
- }).then((res) => {
- this.setData({ userPhone: res.data })
- if(res.code == 200){
- this.setData()
- wx.setStorageSync('member', res.data)
- this.submit()
- }
- })
+ cancelPicker() {
+ this.setData({
+ showPopup: false
})
},
+ // 纭閫夋嫨
+ confirmPicker() {
+ let {
+ activePicker,
+ pickerIndex
+ } = this.data
+ this.setData({
+ [activePicker]: pickerIndex,
+ showPopup: false
+ })
+ },
+
+ // 鑾峰彇鐢ㄦ埛鎵嬫満鍙�
+ getPhoneNumber(e) {
+ const data = {
+ ...e.detail
+ }
+ console.log('e', e);
+ if (data.encryptedData && data.iv) {
+ getWxMiniPhone({
+ encryptedData: data.encryptedData,
+ iv: data.iv,
+ sessionKey: wx.getStorageSync('sessionKey') || data.iv,
+ }).then(res => {
+ binDingPhone({
+ phone: res.data
+ }).then((res) => {
+ this.setData({
+ userPhone: res.data.phone
+ })
+ console.log('userPhone', this.data.userPhone);
+ if (res.code == 200) {
+ this.setData()
+ wx.setStorageSync('member', res.data)
+ this.submit()
+ }
+ })
+ })
+ }
+ },
+
// 绔嬪嵆璁＄畻
- submit () {
+ submit() {
// console.log('绔嬪嵆璁＄畻')
- let { userPhone } = this.data
+ let {
+ userPhone
+ } = this.data
const res = wx.getStorageSync('member')
-
+
if (userPhone) {
- let { type, info, area, money, typeArray, infoArray, calculatorOptions } = this.data
+ let {
+ type,
+ info,
+ area,
+ money,
+ typeArray,
+ infoArray,
+ calculatorOptions
+ } = this.data
let submitData = {}
submitData.name = res.name
submitData.phone = res.phone
@@ -120,21 +162,21 @@
icon: 'none'
})
return false
- }
+ }
if (info === '') {
wx.showToast({
title: '璇烽�夋嫨鎴峰瀷淇℃伅',
icon: 'none'
})
return false
- }
+ }
if (area === '') {
wx.showToast({
title: '璇疯緭鍏ユ埧灞嬮潰绉�',
icon: 'none'
})
return false
- }
+ }
if (money === '') {
wx.showToast({
title: '璇疯緭鍏ヨ淇绠�',
@@ -146,20 +188,20 @@
// submitData = ['鎴垮眿绫诲瀷锛�' + typeArray[type], '鎴峰瀷淇℃伅锛�' + infoArray[info], '鎴垮眿闈㈢Н锛�' + area + '銕�', '瑁呬慨棰勭畻锛�' + money + '涓囧厓'].join('-')
let activeList = type == '0' ? [...calculatorOptions.exquisiteList] : [...calculatorOptions.roughList]
activeList.forEach(item => {
- item.money = (money * item.rate / 100).toFixed(1)
- if(item.children && item.children.length > 0){
+ item.money = (money * item.rate / 100).toFixed(2)
+ if (item.children && item.children.length > 0) {
item.children.forEach(child => {
child.money = (money * child.rate / 100).toFixed(2)
})
}
})
console.log('activeList', activeList);
- saveRenovationCalculator({
+ saveRenovationCalculator({
area,
budget: money,
houseStatus: type,
houseType: info
- }).then(res => {
+ }).then(res => {
// console.log(res)
if (res.success) {
wx.showToast({
@@ -170,13 +212,19 @@
console.log(res.msg)
}
})
- this.setData({ activeList, showResultMoney: true, containerContentStyle: 'auto' })
+ this.setData({
+ activeList,
+ showResultMoney: true,
+ containerContentStyle: 'auto'
+ })
}
},
// 鎻愪氦璁＄畻缁撴灉
- submitCalculatorResult (data) {
- saveRenovationCalculator({ info: data }).then(res => {
+ submitCalculatorResult(data) {
+ saveRenovationCalculator({
+ info: data
+ }).then(res => {
// console.log(res)
if (res.success) {
wx.showToast({
@@ -190,15 +238,19 @@
},
// 鑾峰彇璁＄畻鍣ㄩ厤缃�
- getCalculatorOption () {
+ getCalculatorOption() {
getBjParamConfig().then(res => {
- this.setData({ calculatorOptions: res.data })
+ this.setData({
+ calculatorOptions: res.data
+ })
})
getDictData({
code: 'WEIXIN_DEFAULT_IMGS',
label: 'JISUAN_BG'
}).then(res => {
- this.setData({ background: res.data.code })
+ this.setData({
+ background: res.data.code
+ })
})
},
onReady: function () {
diff --git a/wechat_jiaxuan/pages/calculator/index.wxml b/wechat_jiaxuan/pages/calculator/index.wxml
index 3faaa93..168e6de 100644
--- a/wechat_jiaxuan/pages/calculator/index.wxml
+++ b/wechat_jiaxuan/pages/calculator/index.wxml
@@ -21,7 +21,7 @@
<view class="value" wx:if="{{ type !== '' }}">{{ typeArray[type] }}</view>
<view class="placeholder" wx:else>璇烽�夋嫨</view>
</view>
- <van-icon class="icon" name="arrow-down" />
+ <van-icon color="#B08771" class="icon" name="arrow-down" />
</view>
</view>
@@ -32,14 +32,14 @@
<view class="value" wx:if="{{ info !== '' }}">{{ infoArray[info] }}</view>
<view class="placeholder" wx:else>璇烽�夋嫨</view>
</view>
- <van-icon class="icon" name="arrow-down" />
+ <van-icon color="#B08771" class="icon" name="arrow-down" />
</view>
</view>
<view class="form-item">
<view class="label">鎴垮眿闈㈢Н锛�</view>
<view class="input-box">
- <input class="input" placeholder-class="placeholder" placeholder="0"
+ <input class="input" type="number" placeholder-class="placeholder" placeholder="0"
data-index="area" bindinput="inputTyping" value="{{ area }}"/>
<view class="icon">銕�</view>
</view>
@@ -48,7 +48,7 @@
<view class="form-item">
<view class="label">瑁呬慨棰勭畻锛�</view>
<view class="input-box">
- <input class="input" placeholder-class="placeholder" placeholder="0"
+ <input class="input" type="number" placeholder-class="placeholder" placeholder="0"
data-index="money" bindinput="inputTyping" value="{{ money }}"/>
<view class="icon">涓囧厓</view>
</view>
diff --git a/wechat_jiaxuan/pages/calculator/index.wxss b/wechat_jiaxuan/pages/calculator/index.wxss
index f2353f5..c5c9524 100644
--- a/wechat_jiaxuan/pages/calculator/index.wxss
+++ b/wechat_jiaxuan/pages/calculator/index.wxss
@@ -40,6 +40,7 @@
height: 88rpx;
line-height: 88rpx;
margin-bottom: 40rpx;
+ color: #222222;
}
.calculator .input-box {
@@ -127,6 +128,8 @@
.results .item .td {
line-height: 74rpx;
height: 74rpx;
+ font-weight: 400;
+ font-size: 24rpx;
}
.results .item .th {
diff --git a/wechat_jiaxuan/pages/consult/consult.js b/wechat_jiaxuan/pages/consult/consult.js
index 1da566b..618063a 100644
--- a/wechat_jiaxuan/pages/consult/consult.js
+++ b/wechat_jiaxuan/pages/consult/consult.js
@@ -68,7 +68,7 @@
url: '/pages/webView/index',
success: function(res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', { link: item.openContent, title: item.title })
+ res.eventChannel.emit('acceptDataFromOpenerPage', { link: item.content, title: item.title })
}
})
}else{
diff --git a/wechat_jiaxuan/pages/consult/consult.wxml b/wechat_jiaxuan/pages/consult/consult.wxml
index c5d6470..1db5332 100644
--- a/wechat_jiaxuan/pages/consult/consult.wxml
+++ b/wechat_jiaxuan/pages/consult/consult.wxml
@@ -35,5 +35,8 @@
</view>
</view>
</view>
+ <view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</view>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/homeId/index.wxml b/wechat_jiaxuan/pages/homeId/index.wxml
index 1bac9e2..74954d6 100644
--- a/wechat_jiaxuan/pages/homeId/index.wxml
+++ b/wechat_jiaxuan/pages/homeId/index.wxml
@@ -21,5 +21,8 @@
</view>
</view>
</view>
+ <view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</view>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/index/index.less b/wechat_jiaxuan/pages/index/index.less
index a3fd9bc..93582b8 100644
--- a/wechat_jiaxuan/pages/index/index.less
+++ b/wechat_jiaxuan/pages/index/index.less
@@ -1,6 +1,7 @@
.container {
background-color: #f7f7f7;
overflow-y: auto;
+ overflow-x: hidden;
min-height: 100vh;
.banner_swiper {
diff --git a/wechat_jiaxuan/pages/index/index.wxss b/wechat_jiaxuan/pages/index/index.wxss
index 57cf50e..dc5a7f3 100644
--- a/wechat_jiaxuan/pages/index/index.wxss
+++ b/wechat_jiaxuan/pages/index/index.wxss
@@ -1,6 +1,7 @@
.container {
background-color: #f7f7f7;
overflow-y: auto;
+ overflow-x: hidden;
min-height: 100vh;
}
.container .banner_swiper {
diff --git a/wechat_jiaxuan/pages/mine/mine.less b/wechat_jiaxuan/pages/mine/mine.less
index d1854cb..ccb962b 100644
--- a/wechat_jiaxuan/pages/mine/mine.less
+++ b/wechat_jiaxuan/pages/mine/mine.less
@@ -84,6 +84,7 @@
width: 100%;
padding: 0rpx 40rpx 120rpx;
text-align: center;
+ background-color: #fff;
.h1{
margin-bottom: 16rpx;
font-weight: 600;
diff --git a/wechat_jiaxuan/pages/mine/mine.wxss b/wechat_jiaxuan/pages/mine/mine.wxss
index 4dd3a16..7fc96f8 100644
--- a/wechat_jiaxuan/pages/mine/mine.wxss
+++ b/wechat_jiaxuan/pages/mine/mine.wxss
@@ -75,6 +75,7 @@
width: 100%;
padding: 0rpx 40rpx 120rpx;
text-align: center;
+ background-color: #fff;
}
.liucheng .h1 {
margin-bottom: 16rpx;
diff --git a/wechat_jiaxuan/pages/productVideo/index.wxml b/wechat_jiaxuan/pages/productVideo/index.wxml
index d6c1608..31b55bd 100644
--- a/wechat_jiaxuan/pages/productVideo/index.wxml
+++ b/wechat_jiaxuan/pages/productVideo/index.wxml
@@ -29,5 +29,8 @@
</view>
</view>
</view>
+ <view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</view>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/sets/index.js b/wechat_jiaxuan/pages/sets/index.js
index 7b2701b..f809b93 100644
--- a/wechat_jiaxuan/pages/sets/index.js
+++ b/wechat_jiaxuan/pages/sets/index.js
@@ -49,13 +49,13 @@
title: '娉ㄩ攢鎴愬姛',
})
setTimeout(() => {
+ eventBus.emit("reloadHome")
+ }, 1000)
+ setTimeout(() => {
wx.switchTab({
url: '/pages/index/index',
})
}, 500)
- setTimeout(() => {
- eventBus.emit("reloadHome")
- }, 1000)
} else {
console.log('鐧诲綍澶辫触锛�')
}
diff --git a/wechat_jiaxuan/pages/store/info.js b/wechat_jiaxuan/pages/store/info.js
index 2b43e1a..a141f2f 100644
--- a/wechat_jiaxuan/pages/store/info.js
+++ b/wechat_jiaxuan/pages/store/info.js
@@ -22,20 +22,30 @@
bottomLift: app.bottomLift
})
const res = wx.getMenuButtonBoundingClientRect()
- this.setData({clientHeight: res.height})
- this.setData({clientTop: res.top})
-
+ this.setData({
+ clientHeight: res.height
+ })
+ this.setData({
+ clientTop: res.top
+ })
+
},
navback() {
wx.navigateBack()
},
makePhone(e) {
- const { linkPhone } = this.data.info
- wx.makePhoneCall({ phoneNumber: linkPhone })
+ const {
+ linkPhone
+ } = this.data.info
+ wx.makePhoneCall({
+ phoneNumber: linkPhone
+ })
},
callPhone(e) {
const phone = e.currentTarget.dataset.phone
- wx.makePhoneCall({ phoneNumber: phone })
+ wx.makePhoneCall({
+ phoneNumber: phone
+ })
},
handleDetail(e) {
const id = e.currentTarget.dataset.id
@@ -44,22 +54,23 @@
})
},
handleNavigation() {
- wx.getLocation({
- type: 'gcj02', //杩斿洖鍙互鐢ㄤ簬wx.openLocation鐨勭粡绾害
- success (res) {
- const latitude = res.latitude
- const longitude = res.longitude
- wx.openLocation({
- latitude,
- longitude,
- scale: 18
- })
- }
- })
+ const info = this.data.info
+ const latitude = info.latitude
+ const longitude = info.longitude
+ wx.openLocation({
+ latitude,
+ longitude,
+ name: info.name,
+ scale: 18
+ })
},
getDetail(id) {
- getShopDetail({shopId: id}).then(res => {
- this.setData({ info: res.data })
+ getShopDetail({
+ shopId: id
+ }).then(res => {
+ this.setData({
+ info: res.data
+ })
})
},
onReady() {
diff --git a/wechat_jiaxuan/pages/store/info.less b/wechat_jiaxuan/pages/store/info.less
index 5c8ca7d..de1cba3 100644
--- a/wechat_jiaxuan/pages/store/info.less
+++ b/wechat_jiaxuan/pages/store/info.less
@@ -45,6 +45,8 @@
position: relative;
bottom: 80rpx;
padding: 0 40rpx 40rpx;
+ height: 100%;
+ overflow: hidden;
background-color: #fff;
padding-top: 80rpx;
.title {
@@ -53,6 +55,7 @@
margin-bottom: 38rpx;
}
.list {
+ height: calc( 100% - 600rpx );
.item {
width: 670rpx;
height: 148rpx;
@@ -100,6 +103,14 @@
}
}
}
+.container{
+ overflow: hidden;
+ height: 100%;
+}
+.app{
+ overflow: hidden;
+ height: 100vh;
+}
.footer{
display: flex;
align-items: center;
diff --git a/wechat_jiaxuan/pages/store/info.wxml b/wechat_jiaxuan/pages/store/info.wxml
index 145b001..8ee95eb 100644
--- a/wechat_jiaxuan/pages/store/info.wxml
+++ b/wechat_jiaxuan/pages/store/info.wxml
@@ -1,4 +1,4 @@
-<view>
+<view class="app">
<!-- <view class="bg_wrap"></view> -->
<image class="bg_wrap" src="../../static/images/mendian_bg.png" mode="widthFix"></image>
<view class="navback" style="padding-top: {{ clientTop }}px;height: {{clientHeight + clientTop}}px;">
@@ -8,11 +8,11 @@
<view class="header">
<view class="name">{{ info.name }}</view>
<!-- <view class="desc">鍏ㄥ眿瀹氬埗銆佹暣浣撳帹鎴裤�佹湪闂ㄥ鏉裤�佸崼闃冲畾鍒�</view> -->
- <view class="addr">{{ info.distanceStr }}锝渰{ info.address || '--' }}</view>
+ <view class="addr">{{ info.distanceStr || '--' }}锝渰{ info.address || '--' }}</view>
</view>
<view class="main_content">
<view class="title">闂ㄥ簵瀵艰喘</view>
- <view class="list">
+ <scroll-view scroll-y class="list">
<view class="item" wx:for="{{ info.usersList }}">
<image data-id="{{ item.iamId }}" bindtap="handleDetail" src="{{ item.imgurlFull ? item.imgurlFull : '../../static/images/default_avatar.png' }}" class="avatar"></image>
<view data-id="{{ item.iamId }}" bindtap="handleDetail" class="content">
@@ -21,7 +21,7 @@
</view>
<view data-phone="{{ item.phone }}" bindtap="callPhone" class="btn">鑱旂郴TA</view>
</view>
- </view>
+ </scroll-view>
</view>
</view>
<!-- footer -->
diff --git a/wechat_jiaxuan/pages/store/info.wxss b/wechat_jiaxuan/pages/store/info.wxss
index 66d2a9d..cd9eb99 100644
--- a/wechat_jiaxuan/pages/store/info.wxss
+++ b/wechat_jiaxuan/pages/store/info.wxss
@@ -42,6 +42,8 @@
position: relative;
bottom: 80rpx;
padding: 0 40rpx 40rpx;
+ height: 100%;
+ overflow: hidden;
background-color: #fff;
padding-top: 80rpx;
}
@@ -49,6 +51,9 @@
font-weight: 600;
font-size: 36rpx;
margin-bottom: 38rpx;
+}
+.main_content .list {
+ height: calc(100% - 600rpx);
}
.main_content .list .item {
width: 670rpx;
@@ -90,6 +95,14 @@
color: var(--themeColor);
border: 1rpx solid var(--themeColor);
}
+.container {
+ overflow: hidden;
+ height: 100%;
+}
+.app {
+ overflow: hidden;
+ height: 100vh;
+}
.footer {
display: flex;
align-items: center;
diff --git a/wechat_jiaxuan/pages/store/staff.js b/wechat_jiaxuan/pages/store/staff.js
index b360fda..8f530c7 100644
--- a/wechat_jiaxuan/pages/store/staff.js
+++ b/wechat_jiaxuan/pages/store/staff.js
@@ -33,6 +33,10 @@
}
})
},
+ makePhone() {
+ const phoneNumber = this.data.info.phone
+ wx.makePhoneCall({ phoneNumber })
+ },
openModal() {
if(this.data.info.qrcodeImgFull){
this.setData({ isShow: true })
diff --git a/wechat_jiaxuan/pages/store/staff.wxml b/wechat_jiaxuan/pages/store/staff.wxml
index 9e354a1..611f7fb 100644
--- a/wechat_jiaxuan/pages/store/staff.wxml
+++ b/wechat_jiaxuan/pages/store/staff.wxml
@@ -49,7 +49,7 @@
</view>
</view>
<!-- footer -->
- <view bindtap="openModal" class="footer" style="bottom: {{bottomLift}}px;">
+ <view bindtap="makePhone" class="footer" style="bottom: {{bottomLift}}px;">
<view class="btn">
<image src="../../static/icon/call.png" mode="widthFix"></image>
<view>鑱旂郴TA</view>
diff --git a/wechat_jiaxuan/pages/store/store.less b/wechat_jiaxuan/pages/store/store.less
index af99813..9771d26 100644
--- a/wechat_jiaxuan/pages/store/store.less
+++ b/wechat_jiaxuan/pages/store/store.less
@@ -68,11 +68,13 @@
width: 520rpx;
display: flex;
align-items: center;
- white-space: nowrap;
- overflow: hidden;//鏂囨湰瓒呭嚭闅愯棌
- text-overflow: ellipsis;
font-size: 26rpx;
color: #888888;
+ .text{
+ white-space: nowrap;
+ overflow: hidden;//鏂囨湰瓒呭嚭闅愯棌
+ text-overflow: ellipsis;
+ }
image{
width: 13rpx;
margin-left: 8rpx;
@@ -127,9 +129,8 @@
}
}
.btn{
- display: flex;
- justify-content: center;
- align-items: center;
+ text-align: center;
+ line-height: 62rpx;
height: 66rpx;
font-weight: 500;
font-size: 26rpx;
diff --git a/wechat_jiaxuan/pages/store/store.wxml b/wechat_jiaxuan/pages/store/store.wxml
index 1ba2382..13be104 100644
--- a/wechat_jiaxuan/pages/store/store.wxml
+++ b/wechat_jiaxuan/pages/store/store.wxml
@@ -15,13 +15,13 @@
<view class="left">
<view class="title" data-id="{{ item.id }}" bindtap="handleDetail">{{ item.name }}</view>
<view class="address" data-id="{{ item.id }}" bindtap="handleDetail">
- <text wx:if="{{ item.distanceStr }}">{{ item.distanceStr }} | {{ item.address || '' }}</text>
+ <text class="text" wx:if="{{ item.distanceStr }}">{{ item.distanceStr }} | {{ item.address || '' }}</text>
<text wx:else>--</text>
<image src="../../static/icon/arrow_right.png" mode="widthFix"></image>
</view>
</view>
- <view class="right">
- <image data-phone="{{ item.phone }}" bindtap="makePhone" class="phone" src="../../static/icon/phone.png" mode="widthFix"></image>
+ <view wx:if="{{ item.linkPhone }}" class="right">
+ <image data-phone="{{ item.linkPhone }}" bindtap="makePhone" class="phone" src="../../static/icon/phone.png" mode="widthFix"></image>
<view>鐢佃瘽</view>
</view>
</view>
@@ -32,7 +32,7 @@
<image class="avatar" src="{{ user.imgurlFull ? user.imgurlFull : '../../static/images/default_avatar.png' }}" ></image>
<view class="text">
<view class="name">{{ user.name }}</view>
- <view class="ex" wx:if="{{user.jobDate}}">{{ user.jobDate || 5 }}骞寸粡楠�</view>
+ <view class="ex">{{ user.jobDate || 5 }}骞寸粡楠�</view>
</view>
</view>
<view class="btn">鑱旂郴TA</view>
diff --git a/wechat_jiaxuan/pages/store/store.wxss b/wechat_jiaxuan/pages/store/store.wxss
index 354cfcd..7dd2d16 100644
--- a/wechat_jiaxuan/pages/store/store.wxss
+++ b/wechat_jiaxuan/pages/store/store.wxss
@@ -66,11 +66,13 @@
width: 520rpx;
display: flex;
align-items: center;
+ font-size: 26rpx;
+ color: #888888;
+}
+.main_content .shops .shop .header .left .address .text {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- font-size: 26rpx;
- color: #888888;
}
.main_content .shops .shop .header .left .address image {
width: 13rpx;
@@ -125,9 +127,8 @@
margin-top: 4rpx;
}
.main_content .shops .shop .user_list .item .btn {
- display: flex;
- justify-content: center;
- align-items: center;
+ text-align: center;
+ line-height: 62rpx;
height: 66rpx;
font-weight: 500;
font-size: 26rpx;
diff --git a/wechat_jiaxuan/pages/userinfo/collect.less b/wechat_jiaxuan/pages/userinfo/collect.less
index f2d4f55..b638257 100644
--- a/wechat_jiaxuan/pages/userinfo/collect.less
+++ b/wechat_jiaxuan/pages/userinfo/collect.less
@@ -67,6 +67,7 @@
color: #666666;
.icon{
width: 28rpx;
+ height: 28rpx;
margin-right: 8rpx;
}
.num{
diff --git a/wechat_jiaxuan/pages/userinfo/collect.wxml b/wechat_jiaxuan/pages/userinfo/collect.wxml
index 2193266..fb67bce 100644
--- a/wechat_jiaxuan/pages/userinfo/collect.wxml
+++ b/wechat_jiaxuan/pages/userinfo/collect.wxml
@@ -16,17 +16,19 @@
<view class="list">
<view data-id="{{ item.id }}" wx:for="{{ dataList }}" class="item" bindtap="handleDetail">
<view class="img_wrap">
- <image src="{{ item.thumbnailUrl }}" class="img"></image>
+ <image src="{{ item.thumbnailUrl }}" mode="aspectFill" class="img"></image>
<image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
</view>
<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>
+ <image 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 wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</view>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/collect.wxss b/wechat_jiaxuan/pages/userinfo/collect.wxss
index 8799200..b9cbe65 100644
--- a/wechat_jiaxuan/pages/userinfo/collect.wxss
+++ b/wechat_jiaxuan/pages/userinfo/collect.wxss
@@ -69,6 +69,7 @@
}
.list .item .info .icon {
width: 28rpx;
+ height: 28rpx;
margin-right: 8rpx;
}
.list .item .info .num {
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.less b/wechat_jiaxuan/pages/userinfo/favorite.less
index bdc4a93..83a2add 100644
--- a/wechat_jiaxuan/pages/userinfo/favorite.less
+++ b/wechat_jiaxuan/pages/userinfo/favorite.less
@@ -67,6 +67,7 @@
color: #666666;
.icon{
width: 28rpx;
+ height: 28rpx;
margin-right: 8rpx;
}
.num{
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.wxml b/wechat_jiaxuan/pages/userinfo/favorite.wxml
index f9869e6..1cd6be7 100644
--- a/wechat_jiaxuan/pages/userinfo/favorite.wxml
+++ b/wechat_jiaxuan/pages/userinfo/favorite.wxml
@@ -28,5 +28,8 @@
<text>1000</text>
</view>
</view>
+ <view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</view>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.wxss b/wechat_jiaxuan/pages/userinfo/favorite.wxss
index 7175240..12d27a3 100644
--- a/wechat_jiaxuan/pages/userinfo/favorite.wxss
+++ b/wechat_jiaxuan/pages/userinfo/favorite.wxss
@@ -70,6 +70,7 @@
}
.list .item .info .icon {
width: 28rpx;
+ height: 28rpx;
margin-right: 8rpx;
}
.list .item .info .num {
diff --git a/wechat_jiaxuan/pages/userinfo/index.less b/wechat_jiaxuan/pages/userinfo/index.less
index b5c2ab3..6c13af8 100644
--- a/wechat_jiaxuan/pages/userinfo/index.less
+++ b/wechat_jiaxuan/pages/userinfo/index.less
@@ -47,6 +47,7 @@
}
.icon{
width: 40rpx;
+ height: 40rpx;
}
}
.val{
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxss b/wechat_jiaxuan/pages/userinfo/index.wxss
index 964c77e..9434ad9 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxss
+++ b/wechat_jiaxuan/pages/userinfo/index.wxss
@@ -49,6 +49,7 @@
}
.list .line .icon {
width: 40rpx;
+ height: 40rpx;
}
.list .val {
flex: 1;
diff --git a/wechat_jiaxuan/pages/userinfo/mysub.js b/wechat_jiaxuan/pages/userinfo/mysub.js
index fa703a1..f790c8c 100644
--- a/wechat_jiaxuan/pages/userinfo/mysub.js
+++ b/wechat_jiaxuan/pages/userinfo/mysub.js
@@ -40,10 +40,18 @@
type: activeTabs
},page,capacity
}).then(res => {
- this.setData({
- dataList: res.data.records,
- total: res.data.total,
- })
+ if(res.data && res.data.records){
+ const temp = res.data.records.map(item => {
+ if(item.budget > 10000){
+ item.budget = (item.budget / 10000).toFixed(2) + '涓�'
+ }
+ return item
+ })
+ this.setData({
+ dataList: [ ...this.data.dataList, ...temp ],
+ total: res.data.total,
+ })
+ }
})
},
tabsChange(e) {
diff --git a/wechat_jiaxuan/pages/userinfo/mysub.wxml b/wechat_jiaxuan/pages/userinfo/mysub.wxml
index e8120b7..4e11e55 100644
--- a/wechat_jiaxuan/pages/userinfo/mysub.wxml
+++ b/wechat_jiaxuan/pages/userinfo/mysub.wxml
@@ -48,12 +48,15 @@
</view>
<view class="line">
<view class="label">瑁呬慨棰勭畻</view>
- <view class="val">{{ item.budget }}涓囧厓</view>
+ <view class="val">{{ item.budget }}鍏�</view>
</view>
</block>
<view class="time">
<view>鎻愪氦鏃堕棿锛歿{ item.crmDate }}</view>
</view>
</view>
+ <view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</view>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/webView/index.js b/wechat_jiaxuan/pages/webView/index.js
index 000d2cd..e0ab7d4 100644
--- a/wechat_jiaxuan/pages/webView/index.js
+++ b/wechat_jiaxuan/pages/webView/index.js
@@ -19,7 +19,6 @@
console.log('鍙傛暟', data)
if (data.title) wx.setNavigationBarTitle({ title: data.title })
that.setData({ link: data.link, id: data.id })
- // saveBannerLookNum({ id: data.id })
})
},
diff --git a/wechat_jiaxuan/pages/webView/index.wxml b/wechat_jiaxuan/pages/webView/index.wxml
index 3081c37..e3e1e47 100644
--- a/wechat_jiaxuan/pages/webView/index.wxml
+++ b/wechat_jiaxuan/pages/webView/index.wxml
@@ -1,5 +1,5 @@
<!--pages/webView/index.wxml-->
<web-view src="{{ link }}">
</web-view>
-
+<!-- <view>{{ link }}</view> -->
diff --git a/wechat_jiaxuan/static/images/home_class_a@2x.png b/wechat_jiaxuan/static/images/home_class_a@2x.png
deleted file mode 100644
index 44d76cb..0000000
--- a/wechat_jiaxuan/static/images/home_class_a@2x.png
+++ /dev/null
Binary files differ
diff --git a/wechat_jiaxuan/static/images/home_class_b2@2x.png b/wechat_jiaxuan/static/images/home_class_b2@2x.png
deleted file mode 100644
index 57ea838..0000000
--- a/wechat_jiaxuan/static/images/home_class_b2@2x.png
+++ /dev/null
Binary files differ
diff --git a/wechat_jiaxuan/static/images/home_class_b@2x.png b/wechat_jiaxuan/static/images/home_class_b@2x.png
deleted file mode 100644
index bd3494b..0000000
--- a/wechat_jiaxuan/static/images/home_class_b@2x.png
+++ /dev/null
Binary files differ
diff --git a/wechat_jiaxuan/static/images/home_class_c@2x.png b/wechat_jiaxuan/static/images/home_class_c@2x.png
deleted file mode 100644
index ebb9dce..0000000
--- a/wechat_jiaxuan/static/images/home_class_c@2x.png
+++ /dev/null
Binary files differ
diff --git a/wechat_staff/components/disCase/index.js b/wechat_staff/components/disCase/index.js
index 60e2683..441e32a 100644
--- a/wechat_staff/components/disCase/index.js
+++ b/wechat_staff/components/disCase/index.js
@@ -118,9 +118,10 @@
},
cancelParam() {
const { cateList } = this.data
+ console.log('cateList', cateList);
cateList.forEach(item => {
item.paramIndex = -1
- item.paramName = ''
+ item.paramName = item.paramName || ''
})
this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
},
@@ -130,7 +131,7 @@
},
subParam() {
this.setData({ activeParam: [] })
- this.setData({ pageNum: 1,dataList: [],total: 0})
+ this.setData({ pageNum: 1,activeIndex: -1,dataList: [],total: 0})
this.getList()
},
changeShowParams(e){
diff --git a/wechat_staff/components/disCase/index.less b/wechat_staff/components/disCase/index.less
index f168ad9..5351968 100644
--- a/wechat_staff/components/disCase/index.less
+++ b/wechat_staff/components/disCase/index.less
@@ -171,6 +171,7 @@
margin-left: 12rpx;
.icon{
width: 28rpx;
+ height: 28rpx;
margin-right: 8rpx;
}
.num{
diff --git a/wechat_staff/components/disCase/index.wxss b/wechat_staff/components/disCase/index.wxss
index 57546c4..a00dc11 100644
--- a/wechat_staff/components/disCase/index.wxss
+++ b/wechat_staff/components/disCase/index.wxss
@@ -171,6 +171,7 @@
}
.main_content .goods_list .item .info .icon {
width: 28rpx;
+ height: 28rpx;
margin-right: 8rpx;
}
.main_content .goods_list .item .info .num {
diff --git a/wechat_staff/components/disProduct/index.js b/wechat_staff/components/disProduct/index.js
index 98967cf..3849c24 100644
--- a/wechat_staff/components/disProduct/index.js
+++ b/wechat_staff/components/disProduct/index.js
@@ -138,6 +138,7 @@
const { secondCateList } = this.data
const activeIndex = e.currentTarget.dataset.index
console.log('activeIndex', activeIndex);
+ console.log('activeIndex', this.data.activeIndex);
console.log('secondCateList', secondCateList);
if(activeIndex === this.data.activeIndex){
this.setData({ activeIndex: -1, activeParam: [] })
@@ -154,13 +155,13 @@
const { secondCateList } = this.data
secondCateList.forEach(item => {
item.paramIndex = -1
- item.paramName = ''
+ item.paramName = item.paramName || ''
})
this.setData({ tagCodes: [],activeParam: [],secondCateList,activeIndex: -1 })
},
subParam() {
this.setData({ activeParam: [] })
- this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.setData({ pageNum: 1,activeIndex: -1, datalist: [],total: 0})
this.getList()
},
}
diff --git a/wechat_staff/components/disProduct/index.less b/wechat_staff/components/disProduct/index.less
index b75e32a..2557685 100644
--- a/wechat_staff/components/disProduct/index.less
+++ b/wechat_staff/components/disProduct/index.less
@@ -212,6 +212,7 @@
.icon {
width: 28rpx;
+ height: 28rpx;
margin-right: 8rpx;
}
diff --git a/wechat_staff/components/disProduct/index.wxss b/wechat_staff/components/disProduct/index.wxss
index 90b50c0..7cac77e 100644
--- a/wechat_staff/components/disProduct/index.wxss
+++ b/wechat_staff/components/disProduct/index.wxss
@@ -17,6 +17,7 @@
.app {
height: 100%;
width: 100%;
+ overflow-y: hidden;
}
.app .home_content {
height: 100%;
@@ -192,6 +193,7 @@
}
.main_content .main_right .goods_list .item .info .icon {
width: 28rpx;
+ height: 28rpx;
margin-right: 8rpx;
}
.main_content .main_right .goods_list .item .info .num {
diff --git a/wechat_staff/components/disRealpic/index.js b/wechat_staff/components/disRealpic/index.js
index 52ce1e3..000c3d7 100644
--- a/wechat_staff/components/disRealpic/index.js
+++ b/wechat_staff/components/disRealpic/index.js
@@ -149,7 +149,7 @@
const { cateList } = this.data
cateList.forEach(item => {
item.paramIndex = -1
- item.paramName = ''
+ item.paramName = item.paramName || ''
})
this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
},
@@ -159,7 +159,7 @@
},
subParam() {
this.setData({ activeParam: [] })
- this.setData({ pageNum: 1,dataList: [],total: 0})
+ this.setData({ pageNum: 1,activeIndex: -1,dataList: [],total: 0})
this.getList()
},
changeShowParams(e){
diff --git a/wechat_staff/components/disRealpic/index.less b/wechat_staff/components/disRealpic/index.less
index 8064645..3bf0fcd 100644
--- a/wechat_staff/components/disRealpic/index.less
+++ b/wechat_staff/components/disRealpic/index.less
@@ -182,6 +182,7 @@
.icon {
width: 24rpx;
+ height: 24rpx;
margin-right: 4rpx;
}
}
@@ -222,6 +223,7 @@
.icon {
width: 28rpx;
+ height: 28rpx;
margin-right: 8rpx;
}
diff --git a/wechat_staff/components/disRealpic/index.wxss b/wechat_staff/components/disRealpic/index.wxss
index d7e7468..836d279 100644
--- a/wechat_staff/components/disRealpic/index.wxss
+++ b/wechat_staff/components/disRealpic/index.wxss
@@ -171,6 +171,7 @@
}
.main_content .goods_list .item .img_wrap .full .icon {
width: 24rpx;
+ height: 24rpx;
margin-right: 4rpx;
}
.main_content .goods_list .item .img_wrap .img {
@@ -204,6 +205,7 @@
}
.main_content .goods_list .item .info .icon {
width: 28rpx;
+ height: 28rpx;
margin-right: 8rpx;
}
.main_content .goods_list .item .info .num {
diff --git a/wechat_staff/pages/login/index.js b/wechat_staff/pages/login/index.js
index 040036a..90f7f48 100644
--- a/wechat_staff/pages/login/index.js
+++ b/wechat_staff/pages/login/index.js
@@ -54,6 +54,11 @@
}, 1000)
})
},
+ handleJudge(e) {
+ const flag = e.currentTarget.dataset.flag
+ console.log(e);
+ this.setData({ agreementFalg: flag, showModal: false })
+ },
loginPhone() {
const {
code,
@@ -111,7 +116,8 @@
onLoad(options) {
var app = getApp().globalData
this.setData({
- primary: app.primary
+ primary: app.primary,
+ bottomLift: app.bottomLift
})
this.initData()
},
diff --git a/wechat_staff/pages/login/index.less b/wechat_staff/pages/login/index.less
index a63107c..b5818dc 100644
--- a/wechat_staff/pages/login/index.less
+++ b/wechat_staff/pages/login/index.less
@@ -61,7 +61,37 @@
}
.modal{
width: 100%;
- max-height: 1120rpx;
- min-height: 600rpx;
+ height: calc( 100vh - 200rpx );
padding: 40rpx;
+ position: relative;
+ .content{
+ height: calc( 100vh - 460rpx );
+ overflow: auto;
+ margin-bottom: 20rpx;
+ }
+ .btns{
+ position: fixed;
+ padding: 20rpx 0rpx;
+ width: 100%;
+ z-index: 999;
+ border-top: 1px solid #e5e5e5;
+ .reject{
+ width: 670rpx;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #999999;
+ text-align: center;
+ margin-top: 30rpx;
+ }
+ .agree{
+ width: 670rpx;
+ height: 88rpx;
+ background: #B08771;
+ border-radius: 8rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #fff;
+ }
+ }
}
\ No newline at end of file
diff --git a/wechat_staff/pages/login/index.wxml b/wechat_staff/pages/login/index.wxml
index 0ad9d90..db321a5 100644
--- a/wechat_staff/pages/login/index.wxml
+++ b/wechat_staff/pages/login/index.wxml
@@ -35,7 +35,13 @@
<!-- -->
<van-popup position="bottom" show="{{ showModal }}" round bind:close="onClose">
<view class="modal">
- <mp-html content="{{activeHtml}}"></mp-html>
+ <view class="content">
+ <mp-html content="{{activeHtml}}"></mp-html>
+ </view>
+ <view style="bottom: {{ bottomLift }}px" class="btns">
+ <view data-flag="{{true}}" bindtap="handleJudge" class="agree">鍚屾剰</view>
+ <view data-flag="{{false}}" bindtap="handleJudge" class="reject">涓嶅悓鎰忓苟閫�鍑�</view>
+ </view>
</view>
</van-popup>
</view>
\ No newline at end of file
diff --git a/wechat_staff/pages/login/index.wxss b/wechat_staff/pages/login/index.wxss
index 3aa86a0..cd3c013 100644
--- a/wechat_staff/pages/login/index.wxss
+++ b/wechat_staff/pages/login/index.wxss
@@ -4,7 +4,6 @@
border-radius: 50%;
margin: 130rpx auto 30rpx;
}
-
.home_title {
font-weight: 500;
font-size: 40rpx;
@@ -61,7 +60,38 @@
flex: 1;
}
.modal {
- width: 600rpx;
- min-height: 600rpx;
- padding: 30rpx;
+ width: 100%;
+ height: calc(100vh - 200rpx);
+ padding: 40rpx;
+ position: relative;
+}
+.modal .content {
+ height: calc(100vh - 460rpx);
+ overflow: auto;
+ margin-bottom: 20rpx;
+}
+.modal .btns {
+ position: fixed;
+ padding: 20rpx 0rpx;
+ width: 100%;
+ z-index: 999;
+ border-top: 1px solid #e5e5e5;
+}
+.modal .btns .reject {
+ width: 670rpx;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #999999;
+ text-align: center;
+ margin-top: 30rpx;
+}
+.modal .btns .agree {
+ width: 670rpx;
+ height: 88rpx;
+ background: #B08771;
+ border-radius: 8rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #fff;
}
diff --git a/wechat_staff/pages/sets/index.js b/wechat_staff/pages/sets/index.js
index d232609..1da5c40 100644
--- a/wechat_staff/pages/sets/index.js
+++ b/wechat_staff/pages/sets/index.js
@@ -1,6 +1,8 @@
// pages/sets/index.js
-import { logout } from '../../api/index'
+import {
+ logout
+} from '../../api/index'
Page({
/**
@@ -17,25 +19,35 @@
},
showLogout() {
- this.setData({show: true})
+ wx.showModal({
+ title: '鎻愮ず',
+ content: '纭閫�鍑虹櫥褰�',
+ success(res) {
+ if (res.confirm) {
+ logout({}).then(res => {
+ wx.setStorageSync('member', null)
+ wx.setStorageSync('token', '')
+ wx.navigateTo({
+ url: '/pages/login/index',
+ })
+ })
+ }
+ }
+ })
+
},
onClose() {
- this.setData({show: false})
- },
- changeDeal(e){
- wx.navigateTo({
- url: '/pages/sets/protocol?type='+e.currentTarget.dataset.index,
+ this.setData({
+ show: false
})
},
- logout(){
- logout({
- }).then(res => {
- wx.setStorageSync('member', null)
- wx.setStorageSync('token', '')
- wx.navigateTo({
- url: '/pages/login/index',
- })
- })
+ changeDeal(e) {
+ wx.navigateTo({
+ url: '/pages/sets/protocol?type=' + e.currentTarget.dataset.index,
+ })
+ },
+ logout() {
+
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
diff --git a/wechat_staff/pages/sets/index.less b/wechat_staff/pages/sets/index.less
index c60da15..259efa2 100644
--- a/wechat_staff/pages/sets/index.less
+++ b/wechat_staff/pages/sets/index.less
@@ -11,9 +11,29 @@
}
.icon{
width: 40rpx;
+ height: 40rpx;
}
}
}
+.logout{
+ width: 670rpx;
+ height: 88rpx;
+ line-height: 86rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 8rpx;
+ border: 1rpx solid #B08771;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #B08771;
+ display: flex;
+ margin-top: 100rpx;
+ .icon{
+ width: 40rpx;
+ height: 40rpx;
+ }
+}
.modal{
width: 610rpx;
height: 450rpx;
diff --git a/wechat_staff/pages/sets/index.wxss b/wechat_staff/pages/sets/index.wxss
index b6395d4..fcea0ca 100644
--- a/wechat_staff/pages/sets/index.wxss
+++ b/wechat_staff/pages/sets/index.wxss
@@ -13,6 +13,25 @@
}
.list .line .icon {
width: 40rpx;
+ height: 40rpx;
+}
+.logout {
+ width: 670rpx;
+ height: 88rpx;
+ line-height: 86rpx;
+ align-items: center;
+ justify-content: center;
+ border-radius: 8rpx;
+ border: 1rpx solid #B08771;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #B08771;
+ display: flex;
+ margin-top: 100rpx;
+}
+.logout .icon {
+ width: 40rpx;
+ height: 40rpx;
}
.modal {
width: 610rpx;
diff --git a/wechat_staff/static/images/home_img_weixiaoxd@2x.png b/wechat_staff/static/images/home_img_weixiaoxd@2x.png
deleted file mode 100644
index c6334b5..0000000
--- a/wechat_staff/static/images/home_img_weixiaoxd@2x.png
+++ /dev/null
Binary files differ
diff --git a/wechat_staff/static/test.png b/wechat_staff/static/test.png
deleted file mode 100644
index 4820384..0000000
--- a/wechat_staff/static/test.png
+++ /dev/null
Binary files differ
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index a150c8d..e672602 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,5 +1,5 @@
-export const baseUrl = 'http://192.168.0.135:10027'
-// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // 鏈湴
+// export const baseUrl = 'http://192.168.0.135:10027'
+export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // 鏈湴
// export const baseUrl = 'http://zbtest.ahapp.net/zbom_interface/jx/wechat/' //娴嬭瘯鏈嶅姟鍣�
// export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'
--
Gitblit v1.9.3