From b0fa7738316f0075bdf7282eed5bd394ca3a7584 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 22 七月 2024 15:34:32 +0800
Subject: [PATCH] 提交
---
wechat_staff/utils/config.js | 9 +++------
wechat_staff/pages/client/index.wxml | 3 ++-
wechat_staff/api/index.js | 7 +++++++
wechat_staff/pages/store/staff.wxml | 2 +-
wechat_staff/pages/client/index.js | 26 +++++++++++++++++---------
wechat_staff/pages/sets/protocol.js | 4 ++--
server/service/src/main/java/com/doumee/config/annotation/UserLoginRequired.java | 4 +++-
7 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/config/annotation/UserLoginRequired.java b/server/service/src/main/java/com/doumee/config/annotation/UserLoginRequired.java
index 4319326..b3e74c2 100644
--- a/server/service/src/main/java/com/doumee/config/annotation/UserLoginRequired.java
+++ b/server/service/src/main/java/com/doumee/config/annotation/UserLoginRequired.java
@@ -7,4 +7,6 @@
@Target({ElementType.METHOD,ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
-public @interface UserLoginRequired {}
+public @interface UserLoginRequired {
+
+}
diff --git a/wechat_staff/api/index.js b/wechat_staff/api/index.js
index 0a9f095..28e7a7d 100644
--- a/wechat_staff/api/index.js
+++ b/wechat_staff/api/index.js
@@ -182,3 +182,10 @@
data
})
}
+// 灏忕▼搴忔敞閿�
+export const getCrmAuthUrl = (data) => {
+ return request({
+ url: '/web/customer/getCrmAuthUrl',
+ data
+ })
+}
diff --git a/wechat_staff/pages/client/index.js b/wechat_staff/pages/client/index.js
index b2b175d..340e25e 100644
--- a/wechat_staff/pages/client/index.js
+++ b/wechat_staff/pages/client/index.js
@@ -1,20 +1,26 @@
// pages/client/index.js
-Page({
+import { getCrmAuthUrl, getDictData } from '../../api/index'
+Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
-
- },
-
+ url:''
+ },
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
- onLoad(options) {
-
+ onLoad(options) {
+ this.loadData()
},
-
+ loadData(){
+ wx.showToast()
+ getCrmAuthUrl({type:0}).then(res => {
+ console.log(res.data)
+ this.setData({ url: res.data })
+ })
+ },
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
@@ -25,8 +31,10 @@
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
- onShow() {
-
+ onShow() {
+ // if(this.data.url ==null || this.data.url ==''){
+ // this.loadData()
+ // }
},
/**
diff --git a/wechat_staff/pages/client/index.wxml b/wechat_staff/pages/client/index.wxml
index dec2201..ce2e854 100644
--- a/wechat_staff/pages/client/index.wxml
+++ b/wechat_staff/pages/client/index.wxml
@@ -1,2 +1,3 @@
<!--pages/client/index.wxml-->
-<text>pages/client/index.wxml</text>
+<web-view wx:if="{{url !=null && url !=''}}" src="{{url}}"> </web-view>
+<button wx:else style="margin-top: 50%;width: 200rpx;font-size: 14px;" bind:tap="loadData">閲嶆柊鍔犺浇</button>
diff --git a/wechat_staff/pages/sets/protocol.js b/wechat_staff/pages/sets/protocol.js
index 0c310a4..80fd810 100644
--- a/wechat_staff/pages/sets/protocol.js
+++ b/wechat_staff/pages/sets/protocol.js
@@ -15,9 +15,9 @@
onLoad(options) {
console.log(options.type)
if(options.type == 1){
- wx.setNavigationBarTitle({title:'闅愮鍗忚'})
+ wx.setNavigationBarTitle({title:'鐢ㄦ埛闅愮鍗忚'})
}else{
- wx.setNavigationBarTitle({title:'鐢ㄦ埛鍗忚'})
+ wx.setNavigationBarTitle({title:'鐢ㄦ埛鏈嶅姟鍗忚'})
}
this.loadDict(options.type);
},
diff --git a/wechat_staff/pages/store/staff.wxml b/wechat_staff/pages/store/staff.wxml
index 33b4a62..522ef83 100644
--- a/wechat_staff/pages/store/staff.wxml
+++ b/wechat_staff/pages/store/staff.wxml
@@ -75,4 +75,4 @@
<button class="btn2" bind:tap="saveCard">淇濇寔鍒扮浉鍐�</button>
</view>
</van-popup>
-</view>
\ No newline at end of file
+</view>prod
\ No newline at end of file
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index a6b251c..b472416 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,11 +1,8 @@
-
-
// export const baseUrl = 'https://jiaxuan.zbom.com/jx/wechat/' //姝ｅ紡鏈嶅姟鍣�
-export const baseUrl = 'https://dmtest.ahapp.net/web_interface/' // 鏈湴
-// export const baseUrl = 'http://zbtest.ahapp.net/zbom_interface/jx/wechat/' //娴嬭瘯鏈嶅姟鍣�
-// export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'
-
+// export const baseUrl = 'https://dmtest.ahapp.net/web_interface/' // 娴嬭瘯鏈�
+export const baseUrl = 'http://192.168.0.135:10027' // 鏈湴
+
// 鑵捐鍦板浘寮�鍙戣�� key
export const qqMapKey = 'HIDBZ-2QXL4-TAWUD-XET6Q-EKTJE-CCBSQ'
--
Gitblit v1.9.3