From 744c16a15432461394e1e2dbdfaea34a766fcc6b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 01 八月 2024 08:53:29 +0800
Subject: [PATCH] ‘’
---
wechat_jiaxuan/pages/detailDis/product.js | 5 ++++-
wechat_staff/pages/kefu/select.wxml | 10 +++++-----
wechat_staff/app.js | 1 +
wechat_staff/utils/config.js | 4 ++--
wechat_staff/pages/download/index.js | 4 ----
wechat_staff/pages/login/index.js | 3 +++
wechat_jiaxuan/utils/request.js | 2 +-
wechat_staff/pages/download/index.wxml | 3 ++-
wechat_staff/pages/kefu/select.js | 2 +-
wechat_jiaxuan/utils/config.js | 4 ++--
wechat_staff/utils/request.js | 2 +-
11 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index beb90e7..7f9866a 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -16,7 +16,10 @@
isFold: false,
info: {},
member: {},
- showShare: false
+ showShare: false,
+ options: {
+ empty: '鏃犲弬鏁�'
+ }
},
changeFold() {
this.setData({ isFold: !this.data.isFold })
diff --git a/wechat_jiaxuan/utils/config.js b/wechat_jiaxuan/utils/config.js
index 1448239..ef1c60f 100644
--- a/wechat_jiaxuan/utils/config.js
+++ b/wechat_jiaxuan/utils/config.js
@@ -2,9 +2,9 @@
// export const baseUrl = 'http://192.168.0.135:10027' // 鏈湴
-export const baseUrl = 'https://dmtest.ahapp.net/web_interface' //娴嬭瘯鏈嶅姟鍣�
+// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' //娴嬭瘯鏈嶅姟鍣�
-// export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'
+export const baseUrl = 'https://dmdev.zhibang.com:8443/web_interface'
// 鑵捐鍦板浘寮�鍙戣�� key
export const qqMapKey = 'HIDBZ-2QXL4-TAWUD-XET6Q-EKTJE-CCBSQ'
diff --git a/wechat_jiaxuan/utils/request.js b/wechat_jiaxuan/utils/request.js
index d111b6c..ff29781 100644
--- a/wechat_jiaxuan/utils/request.js
+++ b/wechat_jiaxuan/utils/request.js
@@ -3,7 +3,7 @@
export function request(options){
let loading = options.loading || '1' // 榛樿鍊�1鏄剧ず锛屽惁鍒欎笉鏄剧ず
if(loading == '1'){
- wx.showLoading()
+ wx.showLoading({mask: true})
number ++
}
return new Promise(resolve => {
diff --git a/wechat_staff/app.js b/wechat_staff/app.js
index 553e978..8b77696 100644
--- a/wechat_staff/app.js
+++ b/wechat_staff/app.js
@@ -18,6 +18,7 @@
wx.navigateTo({
url: '/pages/login/index',
})
+ wx.showLoading({title: '鎺堟潈鐧诲綍涓�'})
}else{
getMemberInfo({goLogin:true}).then(res => {
})
diff --git a/wechat_staff/pages/download/index.js b/wechat_staff/pages/download/index.js
index 5bcb799..aa5fd1e 100644
--- a/wechat_staff/pages/download/index.js
+++ b/wechat_staff/pages/download/index.js
@@ -102,10 +102,6 @@
downloadList: temp,
downloadConfig
})
- setTimeout(() => {
- wx.setStorageSync('downloadList', [])
- wx.setStorageSync('downloadConfig', {})
- }, 500)
},
openParam() {
const downloadList = this.data.downloadList.filter(i => i.checked)
diff --git a/wechat_staff/pages/download/index.wxml b/wechat_staff/pages/download/index.wxml
index 57d1041..92e32eb 100644
--- a/wechat_staff/pages/download/index.wxml
+++ b/wechat_staff/pages/download/index.wxml
@@ -1,8 +1,9 @@
<view>
<view class="list">
<view wx:for="{{ downloadList }}" class="item">
- <image class="img" src="{{ item.url }}" mode="scaleToFill"></image>
+ <image class="img" src="{{ item.url }}" mode="aspectFill"></image>
<view wx:if="{{ item.paddingStatus == 2 }}" class="shade">绛夊緟涓嬭浇</view>
+ <view wx:if="{{ item.paddingStatus == 3 }}" class="shade">涓嬭浇瀹屾垚</view>
<image data-i="{{index}}" bindtap="itemCheck" wx:if="{{ item.checked }}" class="check" src="../../static/icon/ic_select_sel@2x.png"></image>
<image wx:else data-i="{{index}}" bindtap="itemCheck" class="check" src="../../static/icon/ic_select.png"></image>
</view>
diff --git a/wechat_staff/pages/kefu/select.js b/wechat_staff/pages/kefu/select.js
index 5896bc1..4243571 100644
--- a/wechat_staff/pages/kefu/select.js
+++ b/wechat_staff/pages/kefu/select.js
@@ -44,7 +44,7 @@
tabsClick(e) {
const flag = e.currentTarget.dataset.tab
this.setData({flag})
- this.setData({total: 0,dataList: [], page: 1})
+ this.setData({total: 0,dataList: [], page: 1, customer: {}})
this.getList()
},
itemCheck(e) {
diff --git a/wechat_staff/pages/kefu/select.wxml b/wechat_staff/pages/kefu/select.wxml
index a9a4f8f..a8a85d2 100644
--- a/wechat_staff/pages/kefu/select.wxml
+++ b/wechat_staff/pages/kefu/select.wxml
@@ -45,16 +45,16 @@
</view>
</view>
<view class="desc">
- <view>鍒涘缓鏃堕棿锛歿{ item.creationDate }}</view>
+ <view>鍒涘缓鏃堕棿锛歿{ item.creationDate || '' }}</view>
<view>瀵艰喘锛歿{ item.dgName }}</view>
</view>
</view>
<view wx:if="{{ flag == 1 }}" class="item">
<view class="item_content">
<view class="checked_wrap">
- <image wx:if="{{ item.checked }}" class="icon" src="../../static/icon/ic_video@2x.png" mode="widthFix"></image>
- <image wx:else class="icon" src="../../static/icon/ic_select@2x.png" mode="widthFix"></image>
- <image class="avatar" src=""></image>
+ <image data-item="{{ item }}" bindtap="itemCheck" wx:if="{{ customer.userId == item.userId }}" class="icon" src="../../static/icon/ic_video@2x.png" mode="widthFix"></image>
+ <image data-item="{{ item }}" bindtap="itemCheck" wx:else class="icon" src="../../static/icon/ic_select@2x.png" mode="widthFix"></image>
+ <image class="avatar" src="../../static/images/default_avatar.png"></image>
</view>
<!-- -->
<view class="content">
@@ -66,7 +66,7 @@
</view>
</view>
<view class="desc">
- <view>鍒涘缓鏃堕棿锛歿{ item.creationDate }}</view>
+ <view>鍒涘缓鏃堕棿锛歿{ item.creationDate || '' }}</view>
<view>瀵艰喘锛歿{ item.dgName }}</view>
</view>
</view>
diff --git a/wechat_staff/pages/login/index.js b/wechat_staff/pages/login/index.js
index 98dbf50..d85ac34 100644
--- a/wechat_staff/pages/login/index.js
+++ b/wechat_staff/pages/login/index.js
@@ -154,6 +154,7 @@
that.setData({openid:res.data.openid})
if (res && res.data !=null && res.data.token!=null) {
console.log(res)
+ wx.hideLoading()
wx.setStorageSync('member', res.data.users || '')
wx.setStorageSync('token', res.data.token || '')
wx.switchTab({
@@ -165,10 +166,12 @@
wx.navigateTo({
url: '/pages/login/index',
})
+ wx.hideLoading()
console.log('鐧诲綍澶辫触锛�' + res)
}
},
fail(err) {
+ wx.hideLoading()
console.log(err)
}
})
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index a150c8d..b0dea33 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,6 +1,6 @@
-export const baseUrl = 'http://192.168.0.135:10027'
+// 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 baseUrl = 'https://dmdev.zhibang.com:8443/web_interface'
// export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'
diff --git a/wechat_staff/utils/request.js b/wechat_staff/utils/request.js
index 8751ff4..6056b6b 100644
--- a/wechat_staff/utils/request.js
+++ b/wechat_staff/utils/request.js
@@ -3,7 +3,7 @@
export function request(options) {
let loading = options.loading || '1' // 榛樿鍊�1鏄剧ず锛屽惁鍒欎笉鏄剧ず
if (loading == '1') {
- wx.showLoading()
+ wx.showLoading({mask: true})
number++
}
return new Promise(resolve=> {
--
Gitblit v1.9.3