From 684ef70c5834b3bdee5997dbdc8bf193eacb7851 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 01 八月 2024 11:34:01 +0800
Subject: [PATCH] lll
---
wechat_staff/pages/consult/consult.js | 7 +
wechat_staff/pages/detailDis/case.js | 3
wechat_jiaxuan/pages/productVideo/index.js | 15 +-
wechat_jiaxuan/pages/userinfo/favorite.js | 47 ++++++-
wechat_staff/pages/detailDis/realpic.js | 3
wechat_jiaxuan/api/index.js | 3
wechat_jiaxuan/app.js | 165 +++++++++++++++++++-------
wechat_staff/pages/homeId/index.js | 8 +
wechat_jiaxuan/pages/homeId/index.js | 7 +
wechat_staff/pages/detailDis/product.js | 2
wechat_jiaxuan/pages/consult/consult.js | 7 +
wechat_jiaxuan/utils/request.js | 40 ++++--
wechat_jiaxuan/pages/index/index.js | 2
wechat_jiaxuan/pages/userinfo/favorite.wxml | 4
14 files changed, 226 insertions(+), 87 deletions(-)
diff --git a/wechat_jiaxuan/api/index.js b/wechat_jiaxuan/api/index.js
index 8c58fb5..695b235 100644
--- a/wechat_jiaxuan/api/index.js
+++ b/wechat_jiaxuan/api/index.js
@@ -34,9 +34,10 @@
})
}
// 鑾峰彇浼氬憳淇℃伅
-export const getMemberInfo = () => {
+export const getMemberInfo = (data) => {
return request({
url: '/web/customer/getMemberInfo',
+ data
})
}
// 棣栭〉 蹇楄瑁呬慨
diff --git a/wechat_jiaxuan/app.js b/wechat_jiaxuan/app.js
index 10dab9b..d52c340 100644
--- a/wechat_jiaxuan/app.js
+++ b/wechat_jiaxuan/app.js
@@ -1,5 +1,6 @@
import {
- wxLoginCustomer
+ wxLoginCustomer,
+ getMemberInfo
} from './api/index'
import CustomHook from 'spa-custom-hooks';
let globalData = {
@@ -24,55 +25,127 @@
this.globalData.bottomLift = WindowInfo.screenHeight - WindowInfo.safeArea.bottom
}
// 鎺堟潈鐧诲綍
- wx.login({
- timeout: 5000,
- success: (res) => {
- var userId = null
- if (op.query.scene) {
- let temp = op.query.scene.split('_')
- userId = temp[2]
- }
- if (res.code) {
- //鍙戣捣缃戠粶璇锋眰
- wxLoginCustomer({
- code: res.code,
- userId
- }).then(res => {
- wx.setStorageSync('token', res.data.token)
- this.globalData.token = res.data.token
- if (op.query.scene) {
- let temp = op.query.scene.split('_')
- wx.navigateTo({
- url: `${pathMap[temp[1]]}?id=${temp[0]}&userId=${temp[2]}`,
- })
- }
- console.log('鎷垮埌token浜�', res.data.token);
- if (res && res.data.member) {
- wx.setStorageSync('member', res.data.member)
- wx.setStorageSync('openid', res.data.member.openid)
- wx.setStorageSync('sessionKey', res.data.sessionKey)
- } else {
- console.log('鐧诲綍澶辫触锛�')
+ var userId = null
+ if (op.query.scene) {
+ let temp = op.query.scene.split('_')
+ userId = temp[2]
+ }
+ const token = wx.getStorageSync('token') || ''
+ if (token) {
+ getMemberInfo({
+ isAuth: true
+ }).then(res => {
+ if (res.code !== 200) {
+ setTimeout(() => {
+ wx.showLoading({
+ title: '姝ｅ湪閲嶆柊鐧诲綍...',
+ mask: true
+ })
+ }, 200)
+ setTimeout(() => {
+ wx.hideLoading()
+ }, 1000)
+ wx.login({
+ timeout: 5000,
+ success: (res) => {
+ var userId = null
+ if (op.query.scene) {
+ let temp = op.query.scene.split('_')
+ userId = temp[2]
+ }
+ if (res.code) {
+ //鍙戣捣缃戠粶璇锋眰
+ wxLoginCustomer({
+ code: res.code,
+ userId
+ }).then(res => {
+ wx.setStorageSync('token', res.data.token)
+ this.globalData.token = res.data.token
+ if (op.query.scene) {
+ let temp = op.query.scene.split('_')
+ wx.navigateTo({
+ url: `${pathMap[temp[1]]}?id=${temp[0]}&userId=${temp[2]}`,
+ })
+ }
+ console.log('鎷垮埌token浜�', res.data.token);
+ if (res && res.data.member) {
+ wx.setStorageSync('member', res.data.member)
+ wx.setStorageSync('openid', res.data.member.openid)
+ wx.setStorageSync('sessionKey', res.data.sessionKey)
+ } else {
+ console.log('鐧诲綍澶辫触锛�')
+ }
+ })
+ } else {
+ console.log('鐧诲綍澶辫触锛�' + res)
+ }
+ },
+ fail(err) {
+ console.log(err)
}
})
} else {
- console.log('鐧诲綍澶辫触锛�' + res)
+ if (op.query.scene) {
+ let temp = op.query.scene.split('_')
+ wx.navigateTo({
+ url: `${pathMap[temp[1]]}?id=${temp[0]}&userId=${temp[2]}`,
+ })
+ }
}
- },
- fail(err) {
- console.log(err)
- }
- })
-
+ })
+ } else {
+ // 鎺堟潈鐧诲綍
+ wx.login({
+ timeout: 5000,
+ success: (res) => {
+ if (op.query.scene) {
+ let temp = op.query.scene.split('_')
+ userId = temp[2]
+ }
+ if (res.code) {
+ //鍙戣捣缃戠粶璇锋眰
+ wxLoginCustomer({
+ code: res.code,
+ userId
+ }).then(res => {
+ wx.setStorageSync('token', res.data.token)
+ this.globalData.token = res.data.token
+ if (op.query.scene) {
+ let temp = op.query.scene.split('_')
+ wx.navigateTo({
+ url: `${pathMap[temp[1]]}?id=${temp[0]}&userId=${temp[2]}`,
+ })
+ }
+ console.log('鎷垮埌token浜�', res.data.token);
+ if (res && res.data.member) {
+ wx.setStorageSync('member', res.data.member)
+ wx.setStorageSync('openid', res.data.member.openid)
+ wx.setStorageSync('sessionKey', res.data.sessionKey)
+ } else {
+ console.log('鐧诲綍澶辫触锛�')
+ }
+ })
+ } else {
+ console.log('鐧诲綍澶辫触锛�' + res)
+ }
+ },
+ fail(err) {
+ console.log(err)
+ }
+ })
+ }
+ },
+ onShow(options) {
+ console.log('options', options);
}
})
CustomHook.install({
- 'Login':{
- name:'Login',
- watchKey: 'token',
- onUpdate(val){
- //鏈塼oken鍒欒Е鍙戞閽╁瓙
- return !!val;
- }
- }
- }, globalData || 'globalData')
\ No newline at end of file
+ 'Login': {
+ name: 'Login',
+ watchKey: 'token',
+ onUpdate(val) {
+ //鏈塼oken鍒欒Е鍙戞閽╁瓙
+ return !!val;
+ }
+ }
+}, globalData || 'globalData')
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/consult/consult.js b/wechat_jiaxuan/pages/consult/consult.js
index 769b437..81f1f32 100644
--- a/wechat_jiaxuan/pages/consult/consult.js
+++ b/wechat_jiaxuan/pages/consult/consult.js
@@ -57,6 +57,13 @@
},
itemClick(e) {
const item = e.currentTarget.dataset.item
+ const { dataList } = this.data
+ dataList.forEach(ite => {
+ if(item.id === ite.id){
+ ite.viewCount += 1
+ }
+ })
+ this.setData({ dataList })
actionDo({actionType: 'view',id: item.id})
if(item.contentType == 'link'){
wx.navigateTo({
diff --git a/wechat_jiaxuan/pages/homeId/index.js b/wechat_jiaxuan/pages/homeId/index.js
index 196a830..c1732e0 100644
--- a/wechat_jiaxuan/pages/homeId/index.js
+++ b/wechat_jiaxuan/pages/homeId/index.js
@@ -60,6 +60,13 @@
},
itemClick(e) {
const item = e.currentTarget.dataset.item
+ const { dataList } = this.data
+ dataList.forEach(ite => {
+ if(item.id === ite.id){
+ ite.viewCount += 1
+ }
+ })
+ this.setData({ dataList })
if(item.contentType){
actionDo({actionType: 'view',id: item.id})
}
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index 0e303f8..6031fc8 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -67,8 +67,8 @@
})
},
onLoad(options) {
- const member = wx.getStorageSync('member')
this.initDictData()
+ this.initData()
},
changePath(e) {
let index = e.currentTarget.dataset.type
diff --git a/wechat_jiaxuan/pages/productVideo/index.js b/wechat_jiaxuan/pages/productVideo/index.js
index 1209c01..61ab302 100644
--- a/wechat_jiaxuan/pages/productVideo/index.js
+++ b/wechat_jiaxuan/pages/productVideo/index.js
@@ -50,19 +50,18 @@
})
},
itemClick(e) {
-
const { videourl ,id} = e.currentTarget.dataset
+ const { dataList } = this.data
+ dataList.forEach(ite => {
+ if(id === ite.id){
+ ite.viewCount += 1
+ }
+ })
+ this.setData({ dataList })
actionDo({
actionType: 'view',
id: id
})
- var dataList = this.data.dataList;
- dataList.forEach(item =>{
- if(item.id == id){
- item.viewCount = (item.viewCount||0) +1
- }
- })
- this.setData({dataList:dataList})
let videoPlay = this.selectComponent('.videoPlay');
if(videoPlay){
videoPlay.startPlayVideo(videourl,this );
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.js b/wechat_jiaxuan/pages/userinfo/favorite.js
index c191d9f..bc2752f 100644
--- a/wechat_jiaxuan/pages/userinfo/favorite.js
+++ b/wechat_jiaxuan/pages/userinfo/favorite.js
@@ -1,6 +1,9 @@
import {
collectLikePage
} from '../../api/index'
+import {
+ eventBus
+} from '../../utils/eventBus'
Page({
/**
@@ -16,6 +19,39 @@
},
onLoad(options) {
this.getList()
+ },
+ onShow() {
+ const dataList = this.data.dataList
+ eventBus.once('caseDeBack', (info) => {
+ const temp = dataList.filter(item => {
+ if (item.id === info.id) {
+ item.isCollection = info.isCollection
+ item.viewCount++
+ }
+ if(item.isCollection) return item
+ })
+ this.setData({ dataList: temp})
+ })
+ eventBus.once('productDeBack', (info) => {
+ const temp = dataList.filter(item => {
+ if (item.id === info.id) {
+ item.isCollection = info.isCollection
+ item.viewCount++
+ }
+ if(item.isCollection) return item
+ })
+ this.setData({ dataList: temp})
+ })
+ eventBus.once('realpicDeBack', (info) => {
+ const temp = dataList.filter(item => {
+ if (item.id === info.id) {
+ item.isCollection = info.isCollection
+ item.viewCount++
+ }
+ if(item.isCollection) return item
+ })
+ this.setData({ dataList: temp})
+ })
},
onPullDownRefresh: function () {
console.log('涓嬫媺鍒锋柊');
@@ -86,17 +122,6 @@
onReady() {
},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
- */
onHide() {
},
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.wxml b/wechat_jiaxuan/pages/userinfo/favorite.wxml
index 1cd6be7..c871d98 100644
--- a/wechat_jiaxuan/pages/userinfo/favorite.wxml
+++ b/wechat_jiaxuan/pages/userinfo/favorite.wxml
@@ -23,9 +23,9 @@
<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>
- <text class="num {{true ? 'primary' : ''}}">34</text>
+ <text class="num {{true ? 'primary' : ''}}">{{ item.collectCount }}</text>
<image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
- <text>1000</text>
+ <text>{{ item.viewCount }}</text>
</view>
</view>
<view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
diff --git a/wechat_jiaxuan/utils/request.js b/wechat_jiaxuan/utils/request.js
index ff29781..865d53a 100644
--- a/wechat_jiaxuan/utils/request.js
+++ b/wechat_jiaxuan/utils/request.js
@@ -1,10 +1,14 @@
-import { baseUrl } from "./config"
+import {
+ baseUrl
+} from "./config"
let number = 0
-export function request(options){
+export function request(options) {
let loading = options.loading || '1' // 榛樿鍊�1鏄剧ず锛屽惁鍒欎笉鏄剧ず
- if(loading == '1'){
- wx.showLoading({mask: true})
- number ++
+ if (loading == '1') {
+ wx.showLoading({
+ mask: true
+ })
+ number++
}
return new Promise(resolve => {
wx.request({
@@ -20,10 +24,19 @@
if (res.data.code === 200) {
resolve(res.data || true)
} else {
- if(res.data.code == 5111 || res.data.code == 5112){
- wx.switchTab({
- url: '/pages/index/index',
+ if (options.data && options.data.isAuth && (res.data.code == 5111 || res.data.code == 5112 || res.data.code == 5110)) {
+ // wx.switchTab({
+ // url: '/pages/index/index',
+ // })
+ resolve(res.data)
+ res.data.message && wx.showToast({
+ title: res.data.message || '鍙戠敓閿欒',
+ icon: 'none'
})
+ return
+ }
+ if(res.data.code == 5111 || res.data.code == 5112 || res.data.code == 5110){
+ return
}
res.data.message && wx.showToast({
title: res.data.message || '鍙戠敓閿欒',
@@ -39,14 +52,13 @@
})
},
complete() {
- if(loading == '1'){
- number --
- if(number == 0){
+ if (loading == '1') {
+ number--
+ if (number == 0) {
wx.hideLoading()
}
}
}
})
- } )
-}
-
+ })
+}
\ No newline at end of file
diff --git a/wechat_staff/pages/consult/consult.js b/wechat_staff/pages/consult/consult.js
index d4ed9bb..26539bb 100644
--- a/wechat_staff/pages/consult/consult.js
+++ b/wechat_staff/pages/consult/consult.js
@@ -58,6 +58,13 @@
itemClick(e) {
const item = e.currentTarget.dataset.item
actionDo({actionType: 'view',id: item.id})
+ const { dataList } = this.data
+ dataList.forEach(ite => {
+ if(item.id === ite.id){
+ ite.viewCount += 1
+ }
+ })
+ this.setData({ dataList })
if(item.contentType == 'link'){
wx.navigateTo({
url: '/pages/webView/index',
diff --git a/wechat_staff/pages/detailDis/case.js b/wechat_staff/pages/detailDis/case.js
index 9d7c6ba..96d2389 100644
--- a/wechat_staff/pages/detailDis/case.js
+++ b/wechat_staff/pages/detailDis/case.js
@@ -97,7 +97,7 @@
actionType: flag ? 'collect' : 'collect_cancel'
}).then(res => {
info.isCollection = flag
- wx.showToast({title: flag ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌'})
+ wx.showToast({title: flag ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',icon: 'none'})
this.setData({
info
})
@@ -116,6 +116,7 @@
this.setData({info})
wx.showToast({
title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
+ icon: 'none'
})
})
},
diff --git a/wechat_staff/pages/detailDis/product.js b/wechat_staff/pages/detailDis/product.js
index 4a5a7ac..ca16234 100644
--- a/wechat_staff/pages/detailDis/product.js
+++ b/wechat_staff/pages/detailDis/product.js
@@ -80,7 +80,7 @@
actionType: flag ? 'collect' : 'collect_cancel'
}).then(res => {
info.isCollection = flag
- wx.showToast({title: flag ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌'})
+ wx.showToast({title: flag ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌', icon: 'none'})
this.setData({
info
})
diff --git a/wechat_staff/pages/detailDis/realpic.js b/wechat_staff/pages/detailDis/realpic.js
index 8471569..68fb9a1 100644
--- a/wechat_staff/pages/detailDis/realpic.js
+++ b/wechat_staff/pages/detailDis/realpic.js
@@ -41,6 +41,7 @@
info.isCollection = !info.isCollection
wx.showToast({
title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
+ icon: 'none'
})
this.setData({info})
})
@@ -78,7 +79,7 @@
actionType: flag ? 'collect' : 'collect_cancel'
}).then(res => {
info.isCollection = flag
- wx.showToast({title: flag ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌'})
+ wx.showToast({title: flag ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌', icon: 'none'})
this.setData({
info
})
diff --git a/wechat_staff/pages/homeId/index.js b/wechat_staff/pages/homeId/index.js
index e36f408..e5d99fe 100644
--- a/wechat_staff/pages/homeId/index.js
+++ b/wechat_staff/pages/homeId/index.js
@@ -57,7 +57,13 @@
},
itemClick(e) {
const item = e.currentTarget.dataset.item
- console.log('item', item);
+ const { dataList } = this.data
+ dataList.forEach(ite => {
+ if(item.id === ite.id){
+ ite.viewCount += 1
+ }
+ })
+ this.setData({ dataList })
if(item.contentType == 'video'){
wx.previewMedia({
sources: [{ url: item.content, type: 'video' }]
--
Gitblit v1.9.3