From 1587f6e47219342a112970da5e870525184121cc Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 26 七月 2024 15:21:28 +0800
Subject: [PATCH] lll
---
wechat_jiaxuan/pages/userinfo/index.wxss | 1
wechat_jiaxuan/pages/userinfo/mysub.js | 16 +
wechat_jiaxuan/pages/consult/consult.wxml | 3
wechat_jiaxuan/components/disProduct/index.js | 1
wechat_jiaxuan/pages/userinfo/collect.less | 1
wechat_jiaxuan/pages/store/info.js | 51 +++--
wechat_jiaxuan/pages/store/info.less | 11 +
wechat_jiaxuan/components/disProduct/index.less | 10 +
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_jiaxuan/pages/consult/consult.js | 2
wechat_jiaxuan/pages/store/staff.wxml | 2
wechat_jiaxuan/pages/store/store.wxml | 8
wechat_jiaxuan/pages/userinfo/favorite.wxss | 1
wechat_jiaxuan/pages/store/store.wxss | 11
wechat_jiaxuan/pages/webView/index.js | 1
wechat_jiaxuan/pages/calculator/index.js | 164 +++++++++++++-------
wechat_jiaxuan/pages/userinfo/favorite.wxml | 3
wechat_staff/utils/config.js | 4
wechat_jiaxuan/components/disCase/index.js | 4
wechat_jiaxuan/pages/homeId/index.wxml | 3
wechat_jiaxuan/pages/mine/mine.less | 1
wechat_jiaxuan/pages/productVideo/index.wxml | 3
wechat_jiaxuan/components/disCase/index.wxml | 5
wechat_jiaxuan/pages/index/index.less | 1
wechat_jiaxuan/components/disCase/index.wxss | 10 +
wechat_jiaxuan/pages/userinfo/index.less | 1
wechat_jiaxuan/pages/webView/index.wxml | 2
/dev/null | 0
wechat_jiaxuan/pages/calculator/index.wxss | 3
wechat_jiaxuan/pages/calculator/index.wxml | 8
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/components/disRealpic/index.wxss | 10 +
wechat_jiaxuan/pages/index/index.wxss | 1
wechat_jiaxuan/pages/mine/mine.wxss | 1
wechat_jiaxuan/pages/userinfo/mysub.wxml | 5
wechat_jiaxuan/pages/store/staff.js | 4
wechat_jiaxuan/pages/userinfo/collect.wxss | 1
wechat_jiaxuan/components/disProduct/index.wxss | 10 +
wechat_jiaxuan/pages/userinfo/collect.wxml | 8
wechat_jiaxuan/components/disProduct/index.wxml | 5
wechat_jiaxuan/pages/store/info.wxss | 13 +
47 files changed, 330 insertions(+), 124 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..3e13e89 100644
--- a/wechat_jiaxuan/components/disCase/index.js
+++ b/wechat_jiaxuan/components/disCase/index.js
@@ -54,10 +54,6 @@
}
})
},
- scrolltoupper() {
- this.setData({ pageNum: 1,datalist: [],total: 0})
- this.getList()
- },
scrolltolower() {
console.log('瑙﹀簳浜嬩欢');
const { total, dataList, pageNum } = this.data
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..31babd3 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -28,7 +28,6 @@
attached() {
this.getCatelist()
var app = getApp()
- console.log('globalData', app.globalData);
if(app.globalData.catalogCode){
this.setData({ catalogCode: app.globalData.catalogCode })
setTimeout(() => {
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.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/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/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