From 2ba73e57ca1f5094cda73e9627ac33d70e7cac41 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 25 七月 2024 11:54:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_staff/components/buoyClient/index.js | 7 ++++---
wechat_staff/pages/webView/index.wxml | 6 +-----
wechat_staff/pages/detailDis/product.js | 9 +++++++++
wechat_staff/pages/webView/index.js | 31 +++++++++++++++----------------
server/service/src/main/java/com/doumee/core/utils/Constants.java | 2 +-
wechat_staff/pages/detailDis/product.wxml | 4 ++--
6 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 18ba136..bdfc54a 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -585,7 +585,7 @@
}
public static void main(String[] args) {
- getImgsFromHtmlText("content: \"<p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/1973fb5c-58ea-4d51-b05f-87c7cd098d9e.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/04c46631-c42c-4b2f-9c92-df9ddb216f73.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/6dc9d538-d260-4970-8580-c248924e3d3f.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/a2ca4806-8d69-40c5-9a89-36381780369d.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/e9bf2963-5b52-411a-8348-c1259a3bd6d3.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/1872ed8b-35f7-4850-8aed-b3bf63573da6.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/afc39c7d-8c46-4f71-9212-6c8bc797c92c.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/78b11cda-fb5b-4983-aa6c-ed371bcd5dcc.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/f09b5a64-7d8a-423c-b423-f45d0e08e010.jpg\"/></p><p><br/></p>\"\n");
+ getImgsFromHtmlText("<p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/40627809-6058-428c-b02a-6715d7b1735a.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/8d9d1737-43c0-4628-a982-ed0832b65464.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/8aacf1bb-5bf0-46dc-bd25-a4f335078711.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/5d5e5af4-fd4e-402f-81d1-e0cc498d55d4.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/4632b61b-0de2-4f73-8b54-f4d6aa3de2db.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/a9eb1a9c-23c7-48aa-9103-cd697158db75.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/a0004771-d606-46fe-b872-07640ee1695a.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/d437bacb-ec87-404e-baa4-a6c040c35216.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/b2c61dc9-fdce-42b1-97d1-12cb993ae8cf.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/e8e27d17-61b0-4035-b229-9ba1c73869eb.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/7f43615d-079e-4133-9e5f-3a1fd19090b8.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/75274ffb-100f-4016-8352-20da9003f192.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/6810dd81-a6bc-4140-bfd7-d9c3e51c2439.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/0dfab735-0a05-47ef-aaa9-728510ad1d2f.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/ca3b095f-17f2-439b-9cd3-10fe60257dd9.jpg\" title=\"\" alt=\"\"/></p>");
}
diff --git a/wechat_staff/components/buoyClient/index.js b/wechat_staff/components/buoyClient/index.js
index 431451b..4a2a98c 100644
--- a/wechat_staff/components/buoyClient/index.js
+++ b/wechat_staff/components/buoyClient/index.js
@@ -26,13 +26,14 @@
const i = e.currentTarget.dataset.i
if(i == 2){
getCrmAuthUrl({type:1}).then(res => {
- console.log(res.data)
- this.setData({ url: res.data })
+ this.setData({ url: res.data })
+ let link = res.data
wx.navigateTo({
url: '/pages/webView/index',
success: function(res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', { link: res.data })
+ console.log(link)
+ res.eventChannel.emit('data',{link:link} );
}
})
})
diff --git a/wechat_staff/pages/detailDis/product.js b/wechat_staff/pages/detailDis/product.js
index e15213f..0fa8bec 100644
--- a/wechat_staff/pages/detailDis/product.js
+++ b/wechat_staff/pages/detailDis/product.js
@@ -183,6 +183,15 @@
onHide() {
},
+ goTestPage(){
+ wx.navigateTo({
+ url: '/pages/webView/index',
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('data',{link:'http://crmtest.zhibang.com:8000/core/oauth/authorize/jump?timestamp=-465385833&agent_phone_number=18055151023&bindKey=mpAddIntention&sign=cdfe13abfe2727b40eee160085c80d11'} );
+ }
+ })
+ },
onUnload() {
},
diff --git a/wechat_staff/pages/detailDis/product.wxml b/wechat_staff/pages/detailDis/product.wxml
index 57266a5..15b08ec 100644
--- a/wechat_staff/pages/detailDis/product.wxml
+++ b/wechat_staff/pages/detailDis/product.wxml
@@ -16,14 +16,14 @@
</view>
<!-- video -->
<view wx:if="{{ info.video }}" class="video">
- <view class="title">浜у搧瑙嗛</view>
+ <view class="title" >浜у搧瑙嗛</view>
<view class="img_wrap">
<image class="img" src="{{ info.coverImage }}" mode="widthFix"></image>
<view bindtap="playVideo" class="play">鎾斁</view>
</view>
</view>
<view class="detail">
- <view class="title">浜у搧璇︽儏</view>
+ <view class="title" bind:tap="goTestPage">浜у搧璇︽儏</view>
<view class="line" wx:for="{{ info.productParamList }}">
<view class="label">{{ item.paramName }}锛�</view>
<view class="val">{{ item.paramValue }}</view>
diff --git a/wechat_staff/pages/webView/index.js b/wechat_staff/pages/webView/index.js
index 5f082d8..8c8b895 100644
--- a/wechat_staff/pages/webView/index.js
+++ b/wechat_staff/pages/webView/index.js
@@ -1,5 +1,6 @@
// pages/webView/index.js
-
+import {
+} from '../../api/index'
Page({
/**
@@ -9,23 +10,21 @@
hasUserInfo: true,
userInfo: {},
id: '',
- link: ''
+ linkUrl: ''
},
+
onLoad: function (options) {
- let that = this
- const eventChannel = this.getOpenerEventChannel()
-
- if (options.link) {
- that.setData({ link: options.link, id: options.id || '' })
- } else {
- // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- eventChannel.on('acceptDataFromOpenerPage', function(data) {
- console.log('鍙傛暟', data)
- if (data.title) wx.setNavigationBarTitle({ title: data.title })
- that.setData({ link: data.link, id: data.id })
- // saveBannerLookNum({ id: data.id })
- })
- }
+ var that = this
+ const eventChannel = this.getOpenerEventChannel()
+ if(eventChannel){
+ eventChannel.on('data', function (res) {
+ console.log(res)//浼犻�掑弬鏁�
+ if(res){
+ that.setData({ linkUrl: res.link})
+ console.log(that.data.linkUrl)
+ }
+ });
+ }
},
/**
diff --git a/wechat_staff/pages/webView/index.wxml b/wechat_staff/pages/webView/index.wxml
index 0a5e8d2..dd50428 100644
--- a/wechat_staff/pages/webView/index.wxml
+++ b/wechat_staff/pages/webView/index.wxml
@@ -1,5 +1 @@
-
-<web-view src="{{link}}">
-</web-view>
-
-
+ <web-view wx:if="{{linkUrl !=null && linkUrl !=''}}" src="{{linkUrl}}"> </web-view>
--
Gitblit v1.9.3