From 53f95e9936dda1090dcf3870f78427896d28a94d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 25 七月 2024 15:24:51 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_staff/pages/promotion/index.js | 8 +++
wechat_staff/utils/config.js | 6 +--
wechat_staff/package-lock.json | 38 +++++-------------
wechat_staff/pages/userinfo/index.wxml | 10 ++--
wechat_staff/api/index.js | 9 ++++
wechat_staff/pages/promotion/index.json | 1
6 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/wechat_staff/api/index.js b/wechat_staff/api/index.js
index d183f79..ba78727 100644
--- a/wechat_staff/api/index.js
+++ b/wechat_staff/api/index.js
@@ -23,6 +23,14 @@
data
})
}
+
+export const getUserCard = (data) => {
+ return request({
+ url: '/web/personnel/getUserCard',
+ method: "POST",
+ data
+ })
+}
// 鑾峰彇鎵嬫満鍙�
export const getWxMiniPhone = (data) => {
return request({
@@ -31,6 +39,7 @@
data
})
}
+
// 缁戝畾Openid
export const bindingOpenid = (data) => {
return request({
diff --git a/wechat_staff/package-lock.json b/wechat_staff/package-lock.json
index 1a3fc03..6816386 100644
--- a/wechat_staff/package-lock.json
+++ b/wechat_staff/package-lock.json
@@ -1,54 +1,38 @@
{
"name": "wechat_staff",
"version": "1.0.0",
- "lockfileVersion": 3,
+ "lockfileVersion": 1,
"requires": true,
- "packages": {
- "": {
- "name": "wechat_staff",
- "version": "1.0.0",
- "license": "ISC",
- "dependencies": {
- "@vant/weapp": "^1.11.6",
- "hy-event-store": "^1.3.1",
- "miniprogram-sm-crypto": "^0.3.13",
- "moment": "^2.30.1",
- "mp-html": "^2.5.0"
- },
- "devDependencies": {}
- },
- "node_modules/@vant/weapp": {
+ "dependencies": {
+ "@vant/weapp": {
"version": "1.11.6",
"resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.11.6.tgz",
"integrity": "sha512-a3heReWYT2gNdsyj6x1hBwsM8V8NrjcPAmle86NH2CD2V/i/h0le75piW6KntSfOPCwekVWMBKhysNrBpJeKdw=="
},
- "node_modules/hy-event-store": {
+ "hy-event-store": {
"version": "1.3.1",
- "resolved": "https://registry.npmjs.org/hy-event-store/-/hy-event-store-1.3.1.tgz",
+ "resolved": "https://registry.npmmirror.com/hy-event-store/-/hy-event-store-1.3.1.tgz",
"integrity": "sha512-uD+14mz4ONiAs9cX/csjUJ2pHTPFciE3JvIbZ+lsbaXopZWbnETEjwJ0a4l5GqNGcltcW3gJjlnUXCJPBoABfg=="
},
- "node_modules/jsbn": {
+ "jsbn": {
"version": "1.1.0",
"resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz",
"integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
},
- "node_modules/miniprogram-sm-crypto": {
+ "miniprogram-sm-crypto": {
"version": "0.3.13",
"resolved": "https://registry.npmmirror.com/miniprogram-sm-crypto/-/miniprogram-sm-crypto-0.3.13.tgz",
"integrity": "sha512-H7qwbCEmIXZzekCSgEWeHh1mb4cnz0E42YH3U5xqpOaJBB2Sj9ySq0hTGv0f+Jwo5SknABR6fw+EtjnMyJ/O/Q==",
- "dependencies": {
+ "requires": {
"jsbn": "^1.1.0"
}
},
- "node_modules/moment": {
+ "moment": {
"version": "2.30.1",
"resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
- "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
- "engines": {
- "node": "*"
- }
+ "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
},
- "node_modules/mp-html": {
+ "mp-html": {
"version": "2.5.0",
"resolved": "https://registry.npmmirror.com/mp-html/-/mp-html-2.5.0.tgz",
"integrity": "sha512-uvBH5tIaDIlj8qaxsvNXU3RKX0jvXOo3J6FAi/notUv/ds6j79UUTE82aDkxxUk0eLUU0CiCqMrR7WWnytk30Q=="
diff --git a/wechat_staff/pages/promotion/index.js b/wechat_staff/pages/promotion/index.js
index 42ce6bd..f03927a 100644
--- a/wechat_staff/pages/promotion/index.js
+++ b/wechat_staff/pages/promotion/index.js
@@ -23,6 +23,10 @@
page:this.data.page,
model:{type:0}})
.then(res =>{
+ wx.stopPullDownRefresh()
+ if(this.data.page ==1){
+ this.setData({list:[]})
+ }
if(this.data.page == res.data.page){
res.data.records.forEach(element => {
element.createDate = moment(element.createDate).format("yyyy/MM/DD")
@@ -182,7 +186,9 @@
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
onPullDownRefresh() {
-
+ console.log('涓嬫媺鍒锋柊')
+ this.setData({ page: 1 })
+ this.getList()
},
/**
diff --git a/wechat_staff/pages/promotion/index.json b/wechat_staff/pages/promotion/index.json
index 1d39d80..3bf5616 100644
--- a/wechat_staff/pages/promotion/index.json
+++ b/wechat_staff/pages/promotion/index.json
@@ -1,4 +1,5 @@
{
"usingComponents": {},
+ "enablePullDownRefresh": true,
"navigationBarTitleText": "鏈�鏂版帹骞胯祫璁�"
}
\ No newline at end of file
diff --git a/wechat_staff/pages/userinfo/index.wxml b/wechat_staff/pages/userinfo/index.wxml
index 6cf78b7..8809959 100644
--- a/wechat_staff/pages/userinfo/index.wxml
+++ b/wechat_staff/pages/userinfo/index.wxml
@@ -26,25 +26,25 @@
</view>
</picker>
</view>
- <view wx:else class="input"><text>{{ userInfo.jobDate }} 骞�</text></view>
+ <view wx:else class="input"><text>{{ userInfo.jobDate || '0' }} 骞�</text></view>
</view>
</view>
<view class="line">
<view class="label">鏈嶅姟瀹㈡埛</view>
- <van-field wx:if="{{ editFalg }}" type="text" border="{{false}}" class="input" model:value="{{ costomerNum }}" maxlength="{{ 5 }}" clearable />
+ <van-field wx:if="{{ editFalg }}" type="text" border="{{false}}" class="input" model:value="{{ costomerNum || '0' }}" maxlength="{{ 5 }}" clearable />
<view wx:else class="input">{{ costomerNum }}</view>
</view>
<view class="line">
<view class="label">闂ㄥ簵鍚嶇О</view>
- <view class="input">{{ userInfo.shopName }}</view>
+ <view class="input">{{ userInfo.shopName || '' }}</view>
</view>
<view class="line">
<view class="label">闂ㄥ簵鍩庡競</view>
- <view class="input">{{ userInfo.shopCity }}</view>
+ <view class="input">{{ userInfo.shopCity || '' }}</view>
</view>
<view class="line">
<view class="label">闂ㄥ簵鍦板潃</view>
- <view class="input">{{ userInfo.shopAddress }}</view>
+ <view class="input">{{ userInfo.shopAddress || '' }}</view>
</view>
<view class="line">
<view class="label">寰俊浜岀淮鐮�</view>
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index a488a8e..a150c8d 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,7 +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